Make the core libqtest library independe from global_qtest
PATCH 1/6 tests/migration: Do not use functions anymore that rely on global_qtest
In reply to Thomas HuthThe migration tests deal with multiple test states, so we really should not use functions here that rely on the single global_qtest variable. Switch from qtest_start() to qtest_init() to make sure that global_qtest is not set anymore. This also revealed a regression in the migrate()
function: It has once been converted to use the qtest_qmp() function, but commit b5bbd3f315d686bd511 ("Clean up string interpolation into QMP, part 2") accidentally reverted it back to qmp().
--- tests/migration-test.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tests/migration-test.c +3 -3
@@ -490,7 +490,7 @@ static void migrate(QTestState *who, const char *uri, const char *fmt, ...)g_assert (!qdict_haskey (args,"uri" ));qdict_put_str (args,"uri" , uri); - rsp =qmp ("{ 'execute': 'migrate', 'arguments': %p}" , args); + rsp =qtest_qmp (who,"{ 'execute': 'migrate', 'arguments': %p}" , args);g_assert (qdict_haskey (rsp,"return" ));qobject_unref (rsp);
@@ -625,7 +625,7 @@ static int test_migrate_start(QTestState **from, QTestState **to, cmd_dst = tmp; } - *from =qtest_start (cmd_src); + *from =qtest_init (cmd_src);g_free (cmd_src); *to =qtest_init (cmd_dst);
@@ -715,7 +715,7 @@ static void test_deprecated(void) {QTestState *from; - from =qtest_start ("-machine none" ); + from =qtest_init ("-machine none" );deprecated_set_downtime (from,0.12345 );deprecated_set_speed (from,12345 );
Signature · 1 line
2.18.1
cover Make the core libqtest library independe from global_qtest
global_qtest and the related wrapper functions often caused trouble in the past - if they are used somewhere in the libqtest or libqos library code, it's hard to write tests that properly track multiple test states (like migration tests).
This patch series finally gets rid of the remaining global_qtest dependencies in the core libqtest code. The first patches are used to clean up some files that should not use global_qtest anymore, then the wrapper functions and the global_qtest definition get moved to a separate header file called libqtest-single.h - which then should only be used in tests that track only a single test state.
Thomas Huth (6):
tests/migration: Do not use functions anymore that rely on
global_qtest
tests/libqos/e1000e: Make e1000e libqos functions independent from
global_qtest
tests/libqos: Replace clock_step with qtest_clock_step in virtio code
tests: Remove unnecessary global_qtest references tests/libqtest: Move global_test wrapper function into a separate
header
tests/libqtest: Use libqtest-single.h in tests that require
global_qtest
MAINTAINERS | 2 +- tests/ahci-test.c | 1 - tests/bios-tables-test.c | 1 - tests/cpu-plug-test.c | 2 +- tests/display-vga-test.c | 2 +- tests/e1000e-test.c | 2 +- tests/fdc-test.c | 2 +- tests/i440fx-test.c | 2 +- tests/i82801b11-test.c | 2 +- tests/intel-hda-test.c | 2 +- tests/ioh3420-test.c | 2 +- tests/ipmi-kcs-test.c | 3 +- tests/ivshmem-test.c | 3 - tests/libqos/e1000e.c | 16 +- tests/libqos/virtio.c | 15 +- tests/libqos/virtio.h | 5 +- tests/libqtest-single.h | 315 ++++++++++++++++++++++++++++++++++ tests/libqtest.c | 13 -- tests/libqtest.h | 289 ------------------------------- tests/migration-test.c | 6 +- tests/qos-test.c | 2 +- tests/rtas-test.c | 1 - tests/rtc-test.c | 2 +- tests/rtl8139-test.c | 2 +- tests/test-netfilter.c | 2 +- tests/test-x86-cpuid-compat.c | 2 +- tests/tmp105-test.c | 2 +- tests/tpm-crb-test.c | 2 +- tests/tpm-tests.c | 2 +- tests/tpm-tis-test.c | 2 +- tests/usb-hcd-ohci-test.c | 2 +- tests/usb-hcd-uhci-test.c | 2 +- tests/usb-hcd-xhci-test.c | 2 +- tests/vhost-user-test.c | 2 +- tests/virtio-blk-test.c | 10 +- tests/virtio-ccw-test.c | 2 +- tests/virtio-net-test.c | 2 +- tests/virtio-scsi-test.c | 2 +- tests/virtio-serial-test.c | 2 +- 39 files changed, 373 insertions(+), 357 deletions(-) create mode 100644 tests/libqtest-single.h
Signature · 1 line
2.18.1
PATCH 2/6 tests/libqos/e1000e: Make e1000e libqos functions independent from global_qtest
libqos library functions should never depend on functions (like memread(), memwrite() or clock_step()) that require global_qtest to be set, since library functions might get used in qtests that track multiple states, too. Thus let's replace the global_qtest-related functions with their independent counterparts.
--- tests/libqos/e1000e.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
tests/libqos/e1000e.c +11 -5
@@ -85,26 +85,32 @@ static uint32_t e1000e_macreg_read(QE1000E *d, uint32_t reg)void e1000e_tx_ring_push (QE1000E *d,void *descr) { +QE1000E_PCI *d_pci =container_of (d,QE1000E_PCI , e1000e);uint32_t tail =e1000e_macreg_read (d,E1000E_TDT );uint32_t len =e1000e_macreg_read (d,E1000E_TDLEN ) /E1000E_TXD_LEN ; -memwrite (d->tx_ring + tail *E1000E_TXD_LEN , descr,E1000E_TXD_LEN ); +qtest_memwrite (d_pci->pci_dev.bus->qts, d->tx_ring + tail *E1000E_TXD_LEN , + descr,E1000E_TXD_LEN );e1000e_macreg_write (d,E1000E_TDT , (tail +1 ) % len);/* Read WB data for the packet transmitted */ -memread (d->tx_ring + tail *E1000E_TXD_LEN , descr,E1000E_TXD_LEN ); +qtest_memread (d_pci->pci_dev.bus->qts, d->tx_ring + tail *E1000E_TXD_LEN , + descr,E1000E_TXD_LEN ); }void e1000e_rx_ring_push (QE1000E *d,void *descr) { +QE1000E_PCI *d_pci =container_of (d,QE1000E_PCI , e1000e);uint32_t tail =e1000e_macreg_read (d,E1000E_RDT );uint32_t len =e1000e_macreg_read (d,E1000E_RDLEN ) /E1000E_RXD_LEN ; -memwrite (d->rx_ring + tail *E1000E_RXD_LEN , descr,E1000E_RXD_LEN ); +qtest_memwrite (d_pci->pci_dev.bus->qts, d->rx_ring + tail *E1000E_RXD_LEN , + descr,E1000E_RXD_LEN );e1000e_macreg_write (d,E1000E_RDT , (tail +1 ) % len);/* Read WB data for the packet received */ -memread (d->rx_ring + tail *E1000E_RXD_LEN , descr,E1000E_RXD_LEN ); +qtest_memread (d_pci->pci_dev.bus->qts, d->rx_ring + tail *E1000E_RXD_LEN , + descr,E1000E_RXD_LEN ); }static void e1000e_foreach_callback (QPCIDevice *dev,int devfn,void *data)
@@ -123,7 +129,7 @@ void e1000e_wait_isr(QE1000E *d, uint16_t msg_id)if (qpci_msix_pending (&d_pci->pci_dev, msg_id)) {return ; } -clock_step (10000 ); +qtest_clock_step (d_pci->pci_dev.bus->qts,10000 ); }while (g_get_monotonic_time () < end_time);g_error ("Timeout expired" );
Signature · 1 line
2.18.1
PATCH 6/6 tests/libqtest: Use libqtest-single.h in tests that require global_qtest
In reply to Thomas HuthTests that require global_qtest or the related wrapper functions now use the libqtest-single.h header that is dedicated for everything related to global_qtest. The core libqtest.c and libqtest.h files are now completely indepedent from global_qtest, so that the core library is now not depending on a global state anymore.
--- tests/cpu-plug-test.c | 2 +- tests/display-vga-test.c | 2 +- tests/e1000e-test.c | 2 +- tests/fdc-test.c | 2 +- tests/i440fx-test.c | 2 +- tests/i82801b11-test.c | 2 +- tests/intel-hda-test.c | 2 +- tests/ioh3420-test.c | 2 +- tests/ipmi-kcs-test.c | 3 +-- tests/libqtest-single.h | 4 ++++ tests/libqtest.c | 2 -- tests/libqtest.h | 4 ---- tests/qos-test.c | 2 +- tests/rtc-test.c | 2 +- tests/rtl8139-test.c | 2 +- tests/test-netfilter.c | 2 +- tests/test-x86-cpuid-compat.c | 2 +- tests/tmp105-test.c | 2 +- tests/tpm-crb-test.c | 2 +- tests/tpm-tests.c | 2 +- tests/tpm-tis-test.c | 2 +- tests/usb-hcd-ohci-test.c | 2 +- tests/usb-hcd-uhci-test.c | 2 +- tests/usb-hcd-xhci-test.c | 2 +- tests/vhost-user-test.c | 2 +- tests/virtio-blk-test.c | 2 +- tests/virtio-ccw-test.c | 2 +- tests/virtio-net-test.c | 2 +- tests/virtio-scsi-test.c | 2 +- tests/virtio-serial-test.c | 2 +- 30 files changed, 31 insertions(+), 34 deletions(-)
tests/cpu-plug-test.c +1 -1
@@ -10,7 +10,7 @@#include "qemu/osdep.h" #include "qemu-common.h" -#include "libqtest.h" +#include "libqtest-single.h" #include "qapi/qmp/qdict.h" struct PlugTestData {
tests/display-vga-test.c +1 -1
@@ -8,7 +8,7 @@*/ #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqtest-single.h" static void pci_cirrus (void ) {
tests/e1000e-test.c +1 -1
@@ -26,7 +26,7 @@#include "qemu/osdep.h" #include "qemu-common.h" -#include "libqtest.h" +#include "libqtest-single.h" #include "qemu-common.h" #include "libqos/pci-pc.h" #include "qemu/sockets.h"
tests/fdc-test.c +1 -1
@@ -25,7 +25,7 @@#include "qemu/osdep.h" -#include "libqtest.h" +#include "libqtest-single.h" #include "qapi/qmp/qdict.h" #include "qemu-common.h"
tests/i440fx-test.c +1 -1
@@ -14,7 +14,7 @@#include "qemu/osdep.h" -#include "libqtest.h" +#include "libqtest-single.h" #include "libqos/pci.h" #include "libqos/pci-pc.h" #include "hw/pci/pci_regs.h"
tests/i82801b11-test.c +1 -1
@@ -8,7 +8,7 @@*/ #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqtest-single.h" /* Tests only initialization so far. TODO: Replace with functional tests */ static void nop (void )
tests/intel-hda-test.c +1 -1
@@ -8,7 +8,7 @@*/ #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqtest-single.h" #define HDA_ID "hda0"#define CODEC_DEVICES " -device hda-output,bus=" HDA_ID ".0" \
tests/ioh3420-test.c +1 -1
@@ -8,7 +8,7 @@*/ #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqtest-single.h" /* Tests only initialization so far. TODO: Replace with functional tests */ static void nop (void )
tests/ipmi-kcs-test.c +1 -2
@@ -24,8 +24,7 @@#include "qemu/osdep.h" - -#include "libqtest.h" +#include "libqtest-single.h" #define IPMI_IRQ 5
tests/libqtest-single.h +4 -0
@@ -11,6 +11,10 @@#ifndef LIBQTEST_SINGLE_H #define LIBQTEST_SINGLE_H +#include "libqtest.h" + +QTestState *global_qtest __attribute__((common, weak)); +/** * qtest_start: * @args: other arguments to pass to QEMU
tests/libqtest.c +0 -2
@@ -35,8 +35,6 @@#define SOCKET_TIMEOUT 50#define SOCKET_MAX_FDS 16 -QTestState *global_qtest; -struct QTestState {int fd;
tests/libqtest.h +0 -4
@@ -22,8 +22,6 @@typedef struct QTestState QTestState ; -extern QTestState *global_qtest; -/** * qtest_initf: * @fmt...: Format for creating other arguments to pass to QEMU, formatted
@@ -641,8 +639,6 @@ void qtest_add_abrt_handler(GHookFunc fn, const void *data); void qtest_qmp_assert_success(QTestState *qts, const char *fmt, ...) GCC_FMT_ATTR(2, 3); -#include "libqtest-single.h" -QDict *qmp_fd_receive (int fd); void qmp_fd_vsend_fds(int fd, int *fds, size_t fds_num, const char *fmt, va_list ap) GCC_FMT_ATTR(4, 0);
tests/qos-test.c +1 -1
@@ -18,7 +18,7 @@#include "qemu/osdep.h" #include <getopt.h> -#include "libqtest.h" +#include "libqtest-single.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qstring.h"
tests/rtc-test.c +1 -1
@@ -13,7 +13,7 @@#include "qemu/osdep.h" -#include "libqtest.h" +#include "libqtest-single.h" #include "qemu/timer.h" #include "hw/timer/mc146818rtc_regs.h"
tests/rtl8139-test.c +1 -1
@@ -8,7 +8,7 @@*/ #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqtest-single.h" #include "libqos/pci-pc.h" #include "qemu/timer.h" #include "qemu-common.h"
tests/test-netfilter.c +1 -1
@@ -9,7 +9,7 @@*/ #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqtest-single.h" #include "qapi/qmp/qdict.h" /* add a netfilter to a netdev and then remove it */
tests/test-x86-cpuid-compat.c +1 -1
@@ -4,7 +4,7 @@#include "qapi/qmp/qlist.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qbool.h" -#include "libqtest.h" +#include "libqtest-single.h" static char *get_cpu0_qom_path (void ) {
tests/tmp105-test.c +1 -1
@@ -9,7 +9,7 @@#include "qemu/osdep.h" -#include "libqtest.h" +#include "libqtest-single.h" #include "libqos/qgraph.h" #include "libqos/i2c.h" #include "qapi/qmp/qdict.h"
tests/tpm-crb-test.c +1 -1
@@ -15,7 +15,7 @@#include "hw/acpi/tpm.h" #include "io/channel-socket.h" -#include "libqtest.h" +#include "libqtest-single.h" #include "qemu/module.h" #include "tpm-emu.h"
tests/tpm-tests.c +1 -1
@@ -15,7 +15,7 @@#include "qemu/osdep.h" #include <glib/gstdio.h> -#include "libqtest.h" +#include "libqtest-single.h" #include "tpm-tests.h" static bool
tests/tpm-tis-test.c +1 -1
@@ -17,7 +17,7 @@#include "hw/acpi/tpm.h" #include "io/channel-socket.h" -#include "libqtest.h" +#include "libqtest-single.h" #include "qemu/module.h" #include "tpm-emu.h"
tests/usb-hcd-ohci-test.c +1 -1
@@ -8,7 +8,7 @@*/ #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqtest-single.h" #include "qemu/module.h" #include "libqos/usb.h" #include "libqos/qgraph.h"
tests/usb-hcd-uhci-test.c +1 -1
@@ -8,7 +8,7 @@*/ #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqtest-single.h" #include "libqos/libqos.h" #include "libqos/usb.h" #include "libqos/libqos-pc.h"
tests/usb-hcd-xhci-test.c +1 -1
@@ -8,7 +8,7 @@*/ #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqtest-single.h" #include "libqos/usb.h"
tests/vhost-user-test.c +1 -1
@@ -10,7 +10,7 @@#include "qemu/osdep.h" -#include "libqtest.h" +#include "libqtest-single.h" #include "qapi/error.h" #include "qapi/qmp/qdict.h" #include "qemu/config-file.h"
tests/virtio-blk-test.c +1 -1
@@ -9,7 +9,7 @@*/ #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqtest-single.h" #include "qemu/bswap.h" #include "qemu/module.h" #include "standard-headers/linux/virtio_blk.h"
tests/virtio-ccw-test.c +1 -1
@@ -14,7 +14,7 @@*/ #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqtest-single.h" #include "libqos/virtio.h" static void virtio_balloon_nop (void )
tests/virtio-net-test.c +1 -1
@@ -9,7 +9,7 @@#include "qemu/osdep.h" #include "qemu-common.h" -#include "libqtest.h" +#include "libqtest-single.h" #include "qemu/iov.h" #include "qemu/module.h" #include "qapi/qmp/qdict.h"
tests/virtio-scsi-test.c +1 -1
@@ -9,7 +9,7 @@*/ #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqtest-single.h" #include "qemu/module.h" #include "scsi/constants.h" #include "libqos/libqos-pc.h"
tests/virtio-serial-test.c +1 -1
@@ -8,7 +8,7 @@*/ #include "qemu/osdep.h" -#include "libqtest.h" +#include "libqtest-single.h" #include "qemu/module.h" #include "libqos/virtio-serial.h"
Signature · 1 line
2.18.1
PATCH 4/6 tests: Remove unnecessary global_qtest references
In reply to Thomas HuthWe are going to remove global_qtest from the main libqtest library soon, so tests that do not urgently need global_qtest anymore should be cleaned from the unnecessary references.
--- tests/ahci-test.c | 1 - tests/bios-tables-test.c | 1 - tests/ivshmem-test.c | 3 --- tests/rtas-test.c | 1 - 4 files changed, 6 deletions(-)
tests/ahci-test.c +0 -1
@@ -200,7 +200,6 @@ static void ahci_shutdown(AHCIQState *ahci) {QOSState *qs = ahci->parent; -assert (!global_qtest);ahci_clean_mem (ahci);free_ahci_device (ahci->dev);g_free (ahci);
tests/bios-tables-test.c +0 -1
@@ -626,7 +626,6 @@ static void test_acpi_one(const char *params, test_data *data)test_smbios_structs (data); } -assert (!global_qtest);qtest_quit (data->qts);g_free (args); }
tests/ivshmem-test.c +0 -3
@@ -100,7 +100,6 @@ static inline void write_mem(IVState *s, uint64_t off,static void cleanup_vm (IVState *s) { -assert (!global_qtest);g_free (s->dev);qtest_shutdown (s->qs); }
@@ -388,7 +387,6 @@ static void test_ivshmem_hotplug(void) qts =qtest_init ("-object memory-backend-ram,size=1M,id=mb1" ); - global_qtest = qts;/* TODO: Get rid of global_qtest here */ qtest_qmp_device_add (qts,"ivshmem-plain" ,"iv1" ,"{'addr': %s, 'memdev': 'mb1'}" ,stringify (PCI_SLOT_HP ));
@@ -397,7 +395,6 @@ static void test_ivshmem_hotplug(void) }qtest_quit (qts); - global_qtest =NULL ; }static void test_ivshmem_memdev (void )
tests/rtas-test.c +0 -1
@@ -14,7 +14,6 @@ static void test_rtas_get_time_of_day(void)time_t t1, t2; qs =qtest_spapr_boot ("-machine pseries" ); - global_qtest = qs->qts; t1 =time (NULL ); ret =qrtas_get_time_of_day (qs->qts, &qs->alloc, &tm, &ns);
Signature · 1 line
2.18.1
PATCH 3/6 tests/libqos: Replace clock_step with qtest_clock_step in virtio code
In reply to Thomas HuthLibrary functions should not rely on functions that require global_qtest (since they might get used in tests that deal with multiple states). Commit 1999a70a05ad603d ("Make generic virtio code independent from global_qtest") already tried to clean the libqos virtio code, but I missed to replace the clock_step() function. Thus change it now to qtest_clock_step() instead.
--- tests/libqos/virtio.c | 15 ++++++++------- tests/libqos/virtio.h | 5 +++-- tests/virtio-blk-test.c | 8 +++++--- 3 files changed, 16 insertions(+), 12 deletions(-)
tests/libqos/virtio.c +8 -7
@@ -82,13 +82,13 @@ void qvirtio_set_driver_ok(QVirtioDevice *d) VIRTIO_CONFIG_S_DRIVER | VIRTIO_CONFIG_S_ACKNOWLEDGE); } -void qvirtio_wait_queue_isr (QVirtioDevice *d, +void qvirtio_wait_queue_isr (QTestState *qts,QVirtioDevice *d,QVirtQueue *vq,gint64 timeout_us) {gint64 start_time =g_get_monotonic_time ();for (;;) { -clock_step (100 ); +qtest_clock_step (qts,100 );if (d->bus->get_queue_isr_status (d, vq)) {return ; }
@@ -109,8 +109,8 @@ uint8_t qvirtio_wait_status_byte_no_isr(QTestState *qts, QVirtioDevice *d,gint64 start_time =g_get_monotonic_time ();uint8_t val; -while ((val =readb (addr)) ==0xff ) { -clock_step (100 ); +while ((val =qtest_readb (qts, addr)) ==0xff ) { +qtest_clock_step (qts,100 );g_assert (!d->bus->get_queue_isr_status (d, vq));g_assert (g_get_monotonic_time () - start_time <= timeout_us); }
@@ -137,7 +137,7 @@ void qvirtio_wait_used_elem(QTestState *qts, QVirtioDevice *d,for (;;) {uint32_t got_desc_idx; -clock_step (100 ); +qtest_clock_step (qts,100 );if (d->bus->get_queue_isr_status (d, vq) &&qvirtqueue_get_buf (qts, vq, &got_desc_idx, len)) {
@@ -149,12 +149,13 @@ void qvirtio_wait_used_elem(QTestState *qts, QVirtioDevice *d, } } -void qvirtio_wait_config_isr (QVirtioDevice *d,gint64 timeout_us) +void qvirtio_wait_config_isr (QTestState *qts,QVirtioDevice *d, +gint64 timeout_us) {gint64 start_time =g_get_monotonic_time ();for (;;) { -clock_step (100 ); +qtest_clock_step (qts,100 );if (d->bus->get_config_isr_status (d)) {return ; }
tests/libqos/virtio.h +3 -2
@@ -112,7 +112,7 @@ void qvirtio_set_acknowledge(QVirtioDevice *d);void qvirtio_set_driver (QVirtioDevice *d);void qvirtio_set_driver_ok (QVirtioDevice *d); -void qvirtio_wait_queue_isr (QVirtioDevice *d, +void qvirtio_wait_queue_isr (QTestState *qts,QVirtioDevice *d,QVirtQueue *vq,gint64 timeout_us); uint8_t qvirtio_wait_status_byte_no_isr(QTestState *qts, QVirtioDevice *d, QVirtQueue *vq,
@@ -123,7 +123,8 @@ void qvirtio_wait_used_elem(QTestState *qts, QVirtioDevice *d,uint32_t desc_idx, uint32_t *len, gint64 timeout_us); -void qvirtio_wait_config_isr (QVirtioDevice *d,gint64 timeout_us); +void qvirtio_wait_config_isr (QTestState *qts,QVirtioDevice *d, +gint64 timeout_us);QVirtQueue *qvirtqueue_setup (QVirtioDevice *d,QGuestAllocator *alloc,uint16_t index); void qvirtqueue_cleanup(const QVirtioBus *bus, QVirtQueue *vq,
tests/virtio-blk-test.c +5 -3
@@ -435,6 +435,7 @@ static void config(void *obj, void *data, QGuestAllocator *t_alloc)QVirtioDevice *dev = blk_if->vdev;int n_size =TEST_IMAGE_SIZE /2 ;uint64_t capacity; +QTestState *qts = global_qtest; capacity =qvirtio_config_readq (dev,0 ); g_assert_cmpint(capacity, ==, TEST_IMAGE_SIZE / 512);
@@ -444,7 +445,7 @@ static void config(void *obj, void *data, QGuestAllocator *t_alloc)qmp_discard_response ("{ 'execute': 'block_resize', " " 'arguments': { 'device': 'drive0', " " 'size': %d } }" , n_size); -qvirtio_wait_config_isr (dev,QVIRTIO_BLK_TIMEOUT_US ); +qvirtio_wait_config_isr (qts, dev,QVIRTIO_BLK_TIMEOUT_US ); capacity =qvirtio_config_readq (dev,0 ); g_assert_cmpint(capacity, ==, n_size / 512);
@@ -494,7 +495,7 @@ static void msix(void *obj, void *u_data, QGuestAllocator *t_alloc)" 'arguments': { 'device': 'drive0', " " 'size': %d } }", n_size); -qvirtio_wait_config_isr (dev,QVIRTIO_BLK_TIMEOUT_US ); +qvirtio_wait_config_isr (qts, dev,QVIRTIO_BLK_TIMEOUT_US ); capacity =qvirtio_config_readq (dev,0 ); g_assert_cmpint(capacity, ==, n_size / 512);
@@ -737,6 +738,7 @@ static void resize(void *obj, void *data, QGuestAllocator *t_alloc)int n_size =TEST_IMAGE_SIZE /2 ;uint64_t capacity;QVirtQueue *vq; +QTestState *qts = global_qtest; vq =qvirtqueue_setup (dev, t_alloc,0 );
@@ -746,7 +748,7 @@ static void resize(void *obj, void *data, QGuestAllocator *t_alloc)" 'arguments': { 'device': 'drive0', " " 'size': %d } }", n_size); -qvirtio_wait_queue_isr (dev, vq,QVIRTIO_BLK_TIMEOUT_US ); +qvirtio_wait_queue_isr (qts, dev, vq,QVIRTIO_BLK_TIMEOUT_US ); capacity =qvirtio_config_readq (dev,0 ); g_assert_cmpint(capacity, ==, n_size / 512);
Signature · 1 line
2.18.1
PATCH 5/6 tests/libqtest: Move global_test wrapper function into a separate header
In reply to Thomas HuthWe want libqtest.h to become completely independen from global_qtest (so that the wrapper functions are not used by accident anymore). As a first step, move the wrapper functions into a separate header file.
--- MAINTAINERS | 2 +- tests/libqtest-single.h | 311 ++++++++++++++++++++++++++++++++++++++++ tests/libqtest.c | 11 -- tests/libqtest.h | 287 +----------------------------------- 4 files changed, 313 insertions(+), 298 deletions(-) create mode 100644 tests/libqtest-single.h
MAINTAINERS +1 -1
@@ -2078,7 +2078,7 @@ R: Paolo Bonzini <[email protected]> S: Maintained F: qtest.c F: accel/qtest.c -F: tests/libqtest.* +F: tests/libqtest* F: tests/libqos/ F: tests/*-test.c
tests/libqtest-single.h new file +311 -0
311 lines not on this page · raw message
tests/libqtest.c +0 -11
@@ -1106,17 +1106,6 @@ void qtest_memset(QTestState *s, uint64_t addr, uint8_t pattern, size_t size)qtest_rsp (s,0 ); } -QDict *qmp (const char *fmt, ...) -{ -va_list ap; -QDict *response; - -va_start (ap, fmt); - response =qtest_vqmp (global_qtest, fmt, ap); -va_end (ap); -return response; -} -void qtest_qmp_assert_success (QTestState *qts,const char *fmt, ...) {va_list ap;
tests/libqtest.h +1 -286
299 lines not on this page · raw message
Signature · 1 line
2.18.1
Re: [Qemu-devel] [PATCH 1/6] tests/migration: Do not use functions anymore that rely on global_qtest
In reply to Thomas HuthQuoted 8 lines · Thomas Huth
The migration tests deal with multiple test states, so we really should not use functions here that rely on the single
global_qtestvariable. Switch fromqtest_start()toqtest_init()to make sure thatglobal_qtestis not set anymore. This also revealed a regression in themigrate()
function: It has once been converted to use theqtest_qmp()function, but commitb5bbd3f315d686bd511("Clean up string interpolation into QMP, part 2") accidentally reverted it back toqmp().
Quoted 6 lines
Reviewed-by Dr. David Alan Gilbert <[email protected]>Signed-off-by Thomas Huth <[email protected]>--- tests/migration-test.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Re: [Qemu-devel] [PATCH 2/6] tests/libqos/e1000e: Make e1000e libqos functions independent from global_qtest
In reply to Thomas HuthQuoted 10 lines · Thomas Huth
libqos library functions should never depend on functions (like
memread(),memwrite()orclock_step()) that requireglobal_qtestto be set, since library functions might get used in qtests that track multiple states, too. Thus let's replace the global_qtest-related functions with their independent counterparts.Signed-off-by Thomas Huth <[email protected]>--- tests/libqos/e1000e.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
Re: [Qemu-devel] [PATCH 3/6] tests/libqos: Replace clock_step with qtest_clock_step in virtio code
In reply to Thomas HuthQuoted 106 lines · Thomas Huth
Library functions should not rely on functions that require
global_qtest(since they might get used in tests that deal with multiple states). Commit1999a70a05ad603d("Make generic virtio code independent fromglobal_qtest") already tried to clean the libqos virtio code, but I missed to replace theclock_step()function. Thus change it now toqtest_clock_step()instead.Signed-off-by Thomas Huth <[email protected]>--- tests/libqos/virtio.c | 15 ++++++++------- tests/libqos/virtio.h | 5 +++-- tests/virtio-blk-test.c | 8 +++++--- 3 files changed, 16 insertions(+), 12 deletions(-)tests/libqos/virtio.c +8
-7@@ -82,13 +82,13 @@ void qvirtio_set_driver_ok(QVirtioDevice *d) VIRTIO_CONFIG_S_DRIVER | VIRTIO_CONFIG_S_ACKNOWLEDGE); } -void qvirtio_wait_queue_isr (QVirtioDevice *d, +void qvirtio_wait_queue_isr (QTestState *qts,QVirtioDevice *d,QVirtQueue *vq,gint64 timeout_us) {gint64 start_time =g_get_monotonic_time ();for (;;) { -clock_step (100 ); +qtest_clock_step (qts,100 );if (d->bus->get_queue_isr_status (d, vq)) {return ; }@@ -109,8 +109,8 @@ uint8_t qvirtio_wait_status_byte_no_isr(QTestState *qts, QVirtioDevice *d,gint64 start_time =g_get_monotonic_time ();uint8_t val; -while ((val =readb (addr)) ==0xff ) { -clock_step (100 ); +while ((val =qtest_readb (qts, addr)) ==0xff ) { +qtest_clock_step (qts,100 );g_assert (!d->bus->get_queue_isr_status (d, vq));g_assert (g_get_monotonic_time () - start_time <= timeout_us); }@@ -137,7 +137,7 @@ void qvirtio_wait_used_elem(QTestState *qts, QVirtioDevice *d,for (;;) {uint32_t got_desc_idx; -clock_step (100 ); +qtest_clock_step (qts,100 );if (d->bus->get_queue_isr_status (d, vq) &&qvirtqueue_get_buf (qts, vq, &got_desc_idx, len)) {@@ -149,12 +149,13 @@ void qvirtio_wait_used_elem(QTestState *qts, QVirtioDevice *d, } } -void qvirtio_wait_config_isr (QVirtioDevice *d,gint64 timeout_us) +void qvirtio_wait_config_isr (QTestState *qts,QVirtioDevice *d, +gint64 timeout_us) {gint64 start_time =g_get_monotonic_time ();for (;;) { -clock_step (100 ); +qtest_clock_step (qts,100 );if (d->bus->get_config_isr_status (d)) {return ; }tests/libqos/virtio.h +3
-2@@ -112,7 +112,7 @@ void qvirtio_set_acknowledge(QVirtioDevice *d);void qvirtio_set_driver (QVirtioDevice *d);void qvirtio_set_driver_ok (QVirtioDevice *d); -void qvirtio_wait_queue_isr (QVirtioDevice *d, +void qvirtio_wait_queue_isr (QTestState *qts,QVirtioDevice *d,QVirtQueue *vq,gint64 timeout_us); uint8_t qvirtio_wait_status_byte_no_isr(QTestState *qts, QVirtioDevice *d, QVirtQueue *vq,@@ -123,7 +123,8 @@ void qvirtio_wait_used_elem(QTestState *qts, QVirtioDevice *d,uint32_t desc_idx, uint32_t *len, gint64 timeout_us); -void qvirtio_wait_config_isr (QVirtioDevice *d,gint64 timeout_us); +void qvirtio_wait_config_isr (QTestState *qts,QVirtioDevice *d, +gint64 timeout_us);QVirtQueue *qvirtqueue_setup (QVirtioDevice *d,QGuestAllocator *alloc,uint16_t index); void qvirtqueue_cleanup(const QVirtioBus *bus, QVirtQueue *vq,tests/virtio-blk-test.c +1
-0@@ -435,6 +435,7 @@ static void config(void *obj, void *data, QGuestAllocator *t_alloc)QVirtioDevice *dev = blk_if->vdev;int n_size =TEST_IMAGE_SIZE /2 ;uint64_t capacity; +QTestState *qts = global_qtest; capacity =qvirtio_config_readq (dev,0 ); g_assert_cmpint(capacity, ==, TEST_IMAGE_SIZE / 512);
tests/virtio-blk-test.c static void config(void *obj, void *data, QGuestAllocator *t_alloc) · line 448
Quoted 5 lines
tests/virtio-blk-test.c +1
-1@@ -444,7 +445,7 @@ static void config(void *obj, void *data, QGuestAllocator *t_alloc)qmp_discard_response ("{ 'execute': 'block_resize', " " 'arguments': { 'device': 'drive0', " " 'size': %d } }" , n_size); -qvirtio_wait_config_isr (dev,QVIRTIO_BLK_TIMEOUT_US ); +qvirtio_wait_config_isr (qts, dev,QVIRTIO_BLK_TIMEOUT_US );
qvirtio_wait_config_isr() calls get_config_isr_status() that will extract qts from PCI bus or MMIO structure. I think you should not add a parameter here and move all the stuff to qvirtio_mmio_get_config_isr_status() and qvirtio_pci_get_config_isr_status().
Thanks,
Laurent