diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2025-02-07 15:30:57 +0000 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2025-02-10 13:47:58 +0000 |
| commit | 059d06c8a84352a64da963fbe70b978e3f225af0 (patch) | |
| tree | 917893836b1e857a824c199954ee11a59d5e527e | |
| parent | 0fa0b5edaaa84a967f96c62f38ddd2d5c08a975a (diff) | |
| download | qemu-059d06c8a84352a64da963fbe70b978e3f225af0.zip qemu-059d06c8a84352a64da963fbe70b978e3f225af0.tar.gz qemu-059d06c8a84352a64da963fbe70b978e3f225af0.tar.bz2 | |
tests/qtest: don't attempt to clock_step while waiting for virtio ISR
This replicates the changes from 92cb8f8bf6 (tests/qtest: remove
clock_steps from virtio tests) as there are no timers in the virtio
code. We still busy wait and timeout though.
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20250207153112.3939799-3-alex.bennee@linaro.org>
| -rw-r--r-- | tests/qtest/libqos/virtio-pci-modern.c | 6 | ||||
| -rw-r--r-- | tests/qtest/libqos/virtio-pci.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/tests/qtest/libqos/virtio-pci-modern.c b/tests/qtest/libqos/virtio-pci-modern.c index 18d1188..4e67fcb 100644 --- a/tests/qtest/libqos/virtio-pci-modern.c +++ b/tests/qtest/libqos/virtio-pci-modern.c @@ -173,13 +173,11 @@ static bool get_config_isr_status(QVirtioDevice *d) static void wait_config_isr_status(QVirtioDevice *d, gint64 timeout_us) { - QVirtioPCIDevice *dev = container_of(d, QVirtioPCIDevice, vdev); gint64 start_time = g_get_monotonic_time(); - do { + while (!get_config_isr_status(d)) { g_assert(g_get_monotonic_time() - start_time <= timeout_us); - qtest_clock_step(dev->pdev->bus->qts, 100); - } while (!get_config_isr_status(d)); + } } static void queue_select(QVirtioDevice *d, uint16_t index) diff --git a/tests/qtest/libqos/virtio-pci.c b/tests/qtest/libqos/virtio-pci.c index 485b8f6..002bf8b 100644 --- a/tests/qtest/libqos/virtio-pci.c +++ b/tests/qtest/libqos/virtio-pci.c @@ -171,13 +171,11 @@ static bool qvirtio_pci_get_config_isr_status(QVirtioDevice *d) static void qvirtio_pci_wait_config_isr_status(QVirtioDevice *d, gint64 timeout_us) { - QVirtioPCIDevice *dev = container_of(d, QVirtioPCIDevice, vdev); gint64 start_time = g_get_monotonic_time(); - do { + while (!qvirtio_pci_get_config_isr_status(d)) { g_assert(g_get_monotonic_time() - start_time <= timeout_us); - qtest_clock_step(dev->pdev->bus->qts, 100); - } while (!qvirtio_pci_get_config_isr_status(d)); + } } static void qvirtio_pci_queue_select(QVirtioDevice *d, uint16_t index) |