Commit b57ebd57 authored by Thomas Huth's avatar Thomas Huth
Browse files

tests/libqos: Replace clock_step with qtest_clock_step in virtio code 



Library functions should not rely on functions that require global_qtest
(since they might get used in tests that deal with multiple states).
Commit 1999a70a ("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.
The logic of the qvirtio_wait_config_isr() function is now pushed
to the virtio-mmio.c and virtio-pci.c files instead, since we can
get the QTestState here easily.

Message-Id: <20190904130047.25808-4-thuth@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
parent 4d81d77e

tests/libqos/virtio-mmio.c

+13 −1
Original line number Diff line number Diff line
@@ -101,6 +101,18 @@ static bool qvirtio_mmio_get_config_isr_status(QVirtioDevice *d) 
    return false;

}



static void qvirtio_mmio_wait_config_isr_status(QVirtioDevice *d,

                                                gint64 timeout_us)

{

    QVirtioMMIODevice *dev = container_of(d, QVirtioMMIODevice, vdev);

    gint64 start_time = g_get_monotonic_time();



    do {

        g_assert(g_get_monotonic_time() - start_time <= timeout_us);

        qtest_clock_step(dev->qts, 100);

    } while (!qvirtio_mmio_get_config_isr_status(d));

}



static void qvirtio_mmio_queue_select(QVirtioDevice *d, uint16_t index)

{

    QVirtioMMIODevice *dev = container_of(d, QVirtioMMIODevice, vdev);
@@ -179,7 +191,7 @@ const QVirtioBus qvirtio_mmio = { 
    .get_status = qvirtio_mmio_get_status,

    .set_status = qvirtio_mmio_set_status,

    .get_queue_isr_status = qvirtio_mmio_get_queue_isr_status,

    .get_config_isr_status = qvirtio_mmio_get_config_isr_status,

    .wait_config_isr_status = qvirtio_mmio_wait_config_isr_status,

    .queue_select = qvirtio_mmio_queue_select,

    .get_queue_size = qvirtio_mmio_get_queue_size,

    .set_queue_address = qvirtio_mmio_set_queue_address,

tests/libqos/virtio-pci.c

+13 −1
Original line number Diff line number Diff line
@@ -175,6 +175,18 @@ 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 {

        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)

{

    QVirtioPCIDevice *dev = container_of(d, QVirtioPCIDevice, vdev);
@@ -257,7 +269,7 @@ const QVirtioBus qvirtio_pci = { 
    .get_status = qvirtio_pci_get_status,

    .set_status = qvirtio_pci_set_status,

    .get_queue_isr_status = qvirtio_pci_get_queue_isr_status,

    .get_config_isr_status = qvirtio_pci_get_config_isr_status,

    .wait_config_isr_status = qvirtio_pci_wait_config_isr_status,

    .queue_select = qvirtio_pci_queue_select,

    .get_queue_size = qvirtio_pci_get_queue_size,

    .set_queue_address = qvirtio_pci_set_queue_address,

tests/libqos/virtio.c

+6 −14
Original line number Diff line number Diff line
@@ -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)) {
@@ -151,15 +151,7 @@ void qvirtio_wait_used_elem(QTestState *qts, QVirtioDevice *d, 


void qvirtio_wait_config_isr(QVirtioDevice *d, gint64 timeout_us)

{

    gint64 start_time = g_get_monotonic_time();



    for (;;) {

        clock_step(100);

        if (d->bus->get_config_isr_status(d)) {

            return;

        }

        g_assert(g_get_monotonic_time() - start_time <= timeout_us);

    }

    d->bus->wait_config_isr_status(d, timeout_us);

}



void qvring_init(QTestState *qts, const QGuestAllocator *alloc, QVirtQueue *vq,

tests/libqos/virtio.h

+3 −3
Original line number Diff line number Diff line
@@ -69,8 +69,8 @@ struct QVirtioBus { 
    /* Get the queue ISR status of the device */

    bool (*get_queue_isr_status)(QVirtioDevice *d, QVirtQueue *vq);



    /* Get the configuration ISR status of the device */

    bool (*get_config_isr_status)(QVirtioDevice *d);

    /* Wait for the configuration ISR status of the device */

    void (*wait_config_isr_status)(QVirtioDevice *d, gint64 timeout_us);



    /* Select a queue to work on */

    void (*queue_select)(QVirtioDevice *d, uint16_t index);
@@ -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,

tests/virtio-blk-test.c

+2 −1
Original line number Diff line number Diff line
@@ -737,6 +737,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 +747,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);