commit 8b898f59b109102faa5de8785e20c23a9445c0b1
author Thomas Huth <thuth@redhat.com> Wed May 15 19:43:23 2019 +0200
committer Thomas Huth <thuth@redhat.com> Tue May 21 10:00:22 2019 +0200
tree a13baa9334de6335148d77df24ddb7415efd6e17
parent 00825d964a55756eb651b4deca560d835999065f

tests/libqos: Get rid of global_qtest dependency in qvring_init()

Library functions should not depend on global_qtest functions like
writew() and writeq(), so that they can also be used in tests that
deal with multiple QTestStates at the same time (like migration tests).

Message-Id: <20190515174328.16361-2-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>

tests/libqos/virtio-pci.c

diff --git a/tests/libqos/virtio-pci.c b/tests/libqos/virtio-pci.c
index 993d347..a622ca2 100644
--- a/tests/libqos/virtio-pci.c
+++ b/tests/libqos/virtio-pci.c
@@ -199,6 +199,7 @@
     uint32_t feat;
     uint64_t addr;
     QVirtQueuePCI *vqpci;
+    QVirtioPCIDevice *qvpcidev = container_of(d, QVirtioPCIDevice, vdev);
 
     vqpci = g_malloc0(sizeof(*vqpci));
     feat = qvirtio_pci_get_guest_features(d);
@@ -224,7 +225,7 @@
 
     addr = guest_alloc(alloc, qvring_size(vqpci->vq.size,
                                           VIRTIO_PCI_VRING_ALIGN));
-    qvring_init(alloc, &vqpci->vq, addr);
+    qvring_init(qvpcidev->pdev->bus->qts, alloc, &vqpci->vq, addr);
     qvirtio_pci_set_queue_address(d, vqpci->vq.desc / VIRTIO_PCI_VRING_ALIGN);
 
     return &vqpci->vq;