Commit 4d81d77e authored by Thomas Huth's avatar Thomas Huth
Browse files

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.

Message-Id: <20190904130047.25808-3-thuth@redhat.com>
Reviewed-by: default avatarLaurent Vivier <lvivier@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
parent a2726593

tests/libqos/e1000e.c

+11 −5
Original line number Diff line number Diff line
@@ -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");