On 07/13/2015 04:52 PM, Fam Zheng wrote: > On Mon, 07/13 14:04, Jason Wang wrote: >> > Rx should be recovered after cont. >> > >> > Signed-off-by: Jason Wang <jasow...@redhat.com> >> > --- >> > Changes from V1: >> > - query status before sending cont, this makes sure that the packet >> > were queued. >> > --- >> > tests/virtio-net-test.c | 52 >> > +++++++++++++++++++++++++++++++++++++++++++++++++ >> > 1 file changed, 52 insertions(+) >> > >> > diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c >> > index b7d6f0b..3c412e2 100644 >> > --- a/tests/virtio-net-test.c >> > +++ b/tests/virtio-net-test.c >> > @@ -140,6 +140,49 @@ static void tx_test(const QVirtioBus *bus, >> > QVirtioDevice *dev, >> > g_assert_cmpstr(buffer, ==, "TEST"); >> > } >> > >> > +static void rx_stop_cont_test(const QVirtioBus *bus, QVirtioDevice *dev, >> > + QGuestAllocator *alloc, QVirtQueue *vq, >> > + int socket) >> > +{ >> > + uint64_t req_addr; >> > + uint32_t free_head; >> > + char test[] = "TEST"; >> > + char buffer[64]; >> > + int len = htonl(sizeof(test)); >> > + struct iovec iov[] = { >> > + { >> > + .iov_base = &len, >> > + .iov_len = sizeof(len), >> > + }, { >> > + .iov_base = test, >> > + .iov_len = sizeof(test), >> > + }, >> > + }; >> > + int ret; >> > + >> > + req_addr = guest_alloc(alloc, 64); >> > + >> > + free_head = qvirtqueue_add(vq, req_addr, 64, true, false); >> > + qvirtqueue_kick(bus, dev, vq, free_head); >> > + >> > + /* We could check the status, but this command is more importantly to >> > + * ensure the packet data gets queued in QEMU, before we do 'cont'. >> > + */ >> > + qmp("{ 'execute' : 'query-status'}"); >> > + qmp("{ 'execute' : 'stop'}"); >> > + >> > + ret = iov_send(socket, iov, 2, 0, sizeof(len) + sizeof(test)); >> > + g_assert_cmpint(ret, ==, sizeof(test) + sizeof(len)); > I meant QMP 'query-status' should be here, between the iov_send and 'cont'. > > Fam >
Sorry, an cut and paste error. Will fix this in next version.