david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: plug some leaks in virtio-net-test

Browse Source 
Found thanks to valgrind.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Marc-André Lureau 2016-07-27 01:15:20 +04:00 committed by Michael S. Tsirkin
parent c89804d674
commit 1ec3b71cde
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/virtio-net-test.c
View File

@ -149,6 +149,7 @@ static void rx_stop_cont_test(const QVirtioBus *bus, QVirtioDevice *dev,
char test[] = "TEST"; char test[] = "TEST";
char buffer[64]; char buffer[64];
int len = htonl(sizeof(test)); int len = htonl(sizeof(test));
QDict *rsp;
struct iovec iov[] = { struct iovec iov[] = {
{ {
.iov_base = &len, .iov_base = &len,
@ -165,7 +166,8 @@ static void rx_stop_cont_test(const QVirtioBus *bus, QVirtioDevice *dev,
free_head = qvirtqueue_add(vq, req_addr, 64, true, false); free_head = qvirtqueue_add(vq, req_addr, 64, true, false);
qvirtqueue_kick(bus, dev, vq, free_head); qvirtqueue_kick(bus, dev, vq, free_head);
qmp("{ 'execute' : 'stop'}"); rsp = qmp("{ 'execute' : 'stop'}");
QDECREF(rsp);
ret = iov_send(socket, iov, 2, 0, sizeof(len) + sizeof(test)); ret = iov_send(socket, iov, 2, 0, sizeof(len) + sizeof(test));
g_assert_cmpint(ret, ==, sizeof(test) + sizeof(len)); g_assert_cmpint(ret, ==, sizeof(test) + sizeof(len));
@ -173,8 +175,10 @@ static void rx_stop_cont_test(const QVirtioBus *bus, QVirtioDevice *dev,
/* We could check the status, but this command is more importantly to /* We could check the status, but this command is more importantly to
* ensure the packet data gets queued in QEMU, before we do 'cont'. * ensure the packet data gets queued in QEMU, before we do 'cont'.
*/ */
qmp("{ 'execute' : 'query-status'}"); rsp = qmp("{ 'execute' : 'query-status'}");
qmp("{ 'execute' : 'cont'}"); QDECREF(rsp);
rsp = qmp("{ 'execute' : 'cont'}");
QDECREF(rsp);
qvirtio_wait_queue_isr(bus, dev, vq, QVIRTIO_NET_TIMEOUT_US); qvirtio_wait_queue_isr(bus, dev, vq, QVIRTIO_NET_TIMEOUT_US);
memread(req_addr + VNET_HDR_SIZE, buffer, sizeof(test)); memread(req_addr + VNET_HDR_SIZE, buffer, sizeof(test));
@ -230,8 +234,10 @@ static void pci_basic(gconstpointer data)
/* End test */ /* End test */
close(sv[0]); close(sv[0]);
qvirtqueue_cleanup(&qvirtio_pci, &tx->vq, alloc); qvirtqueue_cleanup(&qvirtio_pci, &tx->vq, alloc);
qvirtqueue_cleanup(&qvirtio_pci, &rx->vq, alloc);
pc_alloc_uninit(alloc); pc_alloc_uninit(alloc);
qvirtio_pci_device_disable(dev); qvirtio_pci_device_disable(dev);
g_free(dev->pdev);
g_free(dev); g_free(dev);
qpci_free_pc(bus); qpci_free_pc(bus);
test_end(); test_end();