[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/7] tests: fix virtio-net-test ISR dependence
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 6/7] tests: fix virtio-net-test ISR dependence |
Date: |
Fri, 30 Jun 2017 12:46:34 +0100 |
Use the new used ring APIs instead of assuming ISR being set means the
request has completed.
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Tested-by: Eric Blake <address@hidden>
Tested-by: Kevin Wolf <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
tests/virtio-net-test.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c
index 8f94360..635b942 100644
--- a/tests/virtio-net-test.c
+++ b/tests/virtio-net-test.c
@@ -108,7 +108,7 @@ static void rx_test(QVirtioDevice *dev,
ret = iov_send(socket, iov, 2, 0, sizeof(len) + sizeof(test));
g_assert_cmpint(ret, ==, sizeof(test) + sizeof(len));
- qvirtio_wait_queue_isr(dev, vq, QVIRTIO_NET_TIMEOUT_US);
+ qvirtio_wait_used_elem(dev, vq, free_head, QVIRTIO_NET_TIMEOUT_US);
memread(req_addr + VNET_HDR_SIZE, buffer, sizeof(test));
g_assert_cmpstr(buffer, ==, "TEST");
@@ -131,7 +131,7 @@ static void tx_test(QVirtioDevice *dev,
free_head = qvirtqueue_add(vq, req_addr, 64, false, false);
qvirtqueue_kick(dev, vq, free_head);
- qvirtio_wait_queue_isr(dev, vq, QVIRTIO_NET_TIMEOUT_US);
+ qvirtio_wait_used_elem(dev, vq, free_head, QVIRTIO_NET_TIMEOUT_US);
guest_free(alloc, req_addr);
ret = qemu_recv(socket, &len, sizeof(len), 0);
@@ -182,7 +182,7 @@ static void rx_stop_cont_test(QVirtioDevice *dev,
rsp = qmp("{ 'execute' : 'cont'}");
QDECREF(rsp);
- qvirtio_wait_queue_isr(dev, vq, QVIRTIO_NET_TIMEOUT_US);
+ qvirtio_wait_used_elem(dev, vq, free_head, QVIRTIO_NET_TIMEOUT_US);
memread(req_addr + VNET_HDR_SIZE, buffer, sizeof(test));
g_assert_cmpstr(buffer, ==, "TEST");
--
2.9.4
- [Qemu-devel] [PULL 0/7] Block patches, Stefan Hajnoczi, 2017/06/30
- [Qemu-devel] [PULL 1/7] virtio-blk: trace vdev so devices can be distinguished, Stefan Hajnoczi, 2017/06/30
- [Qemu-devel] [PULL 2/7] libqos: fix typo in virtio.h QVirtQueue->used comment, Stefan Hajnoczi, 2017/06/30
- [Qemu-devel] [PULL 3/7] libqos: add virtio used ring support, Stefan Hajnoczi, 2017/06/30
- [Qemu-devel] [PULL 4/7] tests: fix virtio-scsi-test ISR dependence, Stefan Hajnoczi, 2017/06/30
- [Qemu-devel] [PULL 5/7] tests: fix virtio-blk-test ISR dependence, Stefan Hajnoczi, 2017/06/30
- [Qemu-devel] [PULL 6/7] tests: fix virtio-net-test ISR dependence,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 7/7] virtio-pci: use ioeventfd even when KVM is disabled, Stefan Hajnoczi, 2017/06/30
- Re: [Qemu-devel] [PULL 0/7] Block patches, Peter Maydell, 2017/06/30