From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSmTu-00018h-FT for qemu-devel@nongnu.org; Thu, 28 Jul 2016 10:40:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSmTq-00017A-8l for qemu-devel@nongnu.org; Thu, 28 Jul 2016 10:40:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54520) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSmTp-00016a-W3 for qemu-devel@nongnu.org; Thu, 28 Jul 2016 10:40:10 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B2B8B8122E for ; Thu, 28 Jul 2016 14:40:08 +0000 (UTC) From: marcandre.lureau@redhat.com Date: Thu, 28 Jul 2016 18:38:01 +0400 Message-Id: <20160728143808.13707-31-marcandre.lureau@redhat.com> In-Reply-To: <20160728143808.13707-1-marcandre.lureau@redhat.com> References: <20160728143808.13707-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 30/37] tests: free a bunch of qmp responses List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: eblake@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Eric Blake --- tests/libqos/usb.c | 1 + tests/postcopy-test.c | 3 ++- tests/pvpanic-test.c | 1 + tests/test-filter-mirror.c | 4 +++- tests/test-filter-redirector.c | 8 ++++++-- tests/virtio-blk-test.c | 19 +++++++++++++------ tests/virtio-net-test.c | 10 +++++++--- 7 files changed, 33 insertions(+), 13 deletions(-) diff --git a/tests/libqos/usb.c b/tests/libqos/usb.c index f794d92..0b7a610 100644 --- a/tests/libqos/usb.c +++ b/tests/libqos/usb.c @@ -66,4 +66,5 @@ void usb_test_hotplug(const char *hcd_id, const int por= t, g_assert(response); g_assert(qdict_haskey(response, "event")); g_assert(!strcmp(qdict_get_str(response, "event"), "DEVICE_DELETED")= ); + QDECREF(response); } diff --git a/tests/postcopy-test.c b/tests/postcopy-test.c index 16465ab..74fa969 100644 --- a/tests/postcopy-test.c +++ b/tests/postcopy-test.c @@ -397,7 +397,8 @@ static void test_migrate(void) usleep(10 * 1000); } while (dest_byte_a =3D=3D dest_byte_b); =20 - qmp("{ 'execute' : 'stop'}"); + rsp =3D qmp("{ 'execute' : 'stop'}"); + QDECREF(rsp); /* With it stopped, check nothing changes */ qtest_memread(to, start_address, &dest_byte_c, 1); sleep(1); diff --git a/tests/pvpanic-test.c b/tests/pvpanic-test.c index 3bfa678..71ebb5c 100644 --- a/tests/pvpanic-test.c +++ b/tests/pvpanic-test.c @@ -27,6 +27,7 @@ static void test_panic(void) data =3D qdict_get_qdict(response, "data"); g_assert(qdict_haskey(data, "action")); g_assert_cmpstr(qdict_get_str(data, "action"), =3D=3D, "pause"); + QDECREF(response); } =20 int main(int argc, char **argv) diff --git a/tests/test-filter-mirror.c b/tests/test-filter-mirror.c index ffaaffa..8050a6f 100644 --- a/tests/test-filter-mirror.c +++ b/tests/test-filter-mirror.c @@ -26,6 +26,7 @@ static void test_mirror(void) char send_buf[] =3D "Hello! filter-mirror~"; char sock_path[] =3D "filter-mirror.XXXXXX"; char *recv_buf; + QDict *resp; uint32_t size =3D sizeof(send_buf); size =3D htonl(size); =20 @@ -57,7 +58,8 @@ static void test_mirror(void) }; =20 /* send a qmp command to guarantee that 'connected' is setting to tr= ue. */ - qmp("{ 'execute' : 'query-status'}"); + resp =3D qmp("{ 'execute' : 'query-status'}"); + QDECREF(resp); ret =3D iov_send(send_sock[0], iov, 2, 0, sizeof(size) + sizeof(send= _buf)); g_assert_cmpint(ret, =3D=3D, sizeof(send_buf) + sizeof(size)); close(send_sock[0]); diff --git a/tests/test-filter-redirector.c b/tests/test-filter-redirecto= r.c index c63b68f..779a4f3 100644 --- a/tests/test-filter-redirector.c +++ b/tests/test-filter-redirector.c @@ -69,6 +69,7 @@ static void test_redirector_tx(void) char sock_path0[] =3D "filter-redirector0.XXXXXX"; char sock_path1[] =3D "filter-redirector1.XXXXXX"; char *recv_buf; + QDict *resp; uint32_t size =3D sizeof(send_buf); size =3D htonl(size); =20 @@ -99,7 +100,8 @@ static void test_redirector_tx(void) g_assert_cmpint(recv_sock, !=3D, -1); =20 /* send a qmp command to guarantee that 'connected' is setting to tr= ue. */ - qmp("{ 'execute' : 'query-status'}"); + resp =3D qmp("{ 'execute' : 'query-status'}"); + QDECREF(resp); =20 struct iovec iov[] =3D { { @@ -145,6 +147,7 @@ static void test_redirector_rx(void) char sock_path0[] =3D "filter-redirector0.XXXXXX"; char sock_path1[] =3D "filter-redirector1.XXXXXX"; char *recv_buf; + QDict *resp; uint32_t size =3D sizeof(send_buf); size =3D htonl(size); =20 @@ -184,7 +187,8 @@ static void test_redirector_rx(void) send_sock =3D unix_connect(sock_path1, NULL); g_assert_cmpint(send_sock, !=3D, -1); /* send a qmp command to guarantee that 'connected' is setting to tr= ue. */ - qmp("{ 'execute' : 'query-status'}"); + resp =3D qmp("{ 'execute' : 'query-status'}"); + QDECREF(resp); =20 ret =3D iov_send(send_sock, iov, 2, 0, sizeof(size) + sizeof(send_bu= f)); g_assert_cmpint(ret, =3D=3D, sizeof(send_buf) + sizeof(size)); diff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c index 811cf75..48822a2 100644 --- a/tests/virtio-blk-test.c +++ b/tests/virtio-blk-test.c @@ -416,6 +416,7 @@ static void pci_config(void) int n_size =3D TEST_IMAGE_SIZE / 2; void *addr; uint64_t capacity; + QDict *resp; =20 bus =3D pci_test_start(); =20 @@ -430,8 +431,10 @@ static void pci_config(void) =20 qvirtio_set_driver_ok(&qvirtio_pci, &dev->vdev); =20 - qmp("{ 'execute': 'block_resize', 'arguments': { 'device': 'drive0',= " - " 'size': %d } }", n= _size); + resp =3D qmp("{ 'execute': 'block_resize', 'arguments': " + "{ 'device': 'drive0', 'size': %d } }", n_size); + QDECREF(resp); + qvirtio_wait_config_isr(&qvirtio_pci, &dev->vdev, QVIRTIO_BLK_TIMEOU= T_US); =20 capacity =3D qvirtio_config_readq(&qvirtio_pci, &dev->vdev, @@ -459,6 +462,7 @@ static void pci_msix(void) uint32_t free_head; uint8_t status; char *data; + QDict *resp; =20 bus =3D pci_test_start(); alloc =3D pc_alloc_init(); @@ -488,8 +492,9 @@ static void pci_msix(void) =20 qvirtio_set_driver_ok(&qvirtio_pci, &dev->vdev); =20 - qmp("{ 'execute': 'block_resize', 'arguments': { 'device': 'drive0',= " - " 'size': %d } }", n= _size); + resp =3D qmp("{ 'execute': 'block_resize', 'arguments': " + "{ 'device': 'drive0', 'size': %d } }", n_size); + QDECREF(resp); =20 qvirtio_wait_config_isr(&qvirtio_pci, &dev->vdev, QVIRTIO_BLK_TIMEOU= T_US); =20 @@ -717,6 +722,7 @@ static void mmio_basic(void) QGuestAllocator *alloc; int n_size =3D TEST_IMAGE_SIZE / 2; uint64_t capacity; + QDict *resp; =20 arm_test_start(); =20 @@ -734,8 +740,9 @@ static void mmio_basic(void) test_basic(&qvirtio_mmio, &dev->vdev, alloc, vq, QVIRTIO_MMIO_DEVICE_SPECIFIC); =20 - qmp("{ 'execute': 'block_resize', 'arguments': { 'device': 'drive0',= " - " 'size': %d } }", n= _size); + resp =3D qmp("{ 'execute': 'block_resize', 'arguments': " + "{ 'device': 'drive0', 'size': %d } }", n_size); + QDECREF(resp); =20 qvirtio_wait_queue_isr(&qvirtio_mmio, &dev->vdev, vq, QVIRTIO_BLK_TIMEOUT_US); diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c index a34a939..43de303 100644 --- a/tests/virtio-net-test.c +++ b/tests/virtio-net-test.c @@ -159,13 +159,15 @@ static void rx_stop_cont_test(const QVirtioBus *bus= , QVirtioDevice *dev, }, }; int ret; + QDict *resp; =20 req_addr =3D guest_alloc(alloc, 64); =20 free_head =3D qvirtqueue_add(vq, req_addr, 64, true, false); qvirtqueue_kick(bus, dev, vq, free_head); =20 - qmp("{ 'execute' : 'stop'}"); + resp =3D qmp("{ 'execute' : 'stop'}"); + QDECREF(resp); =20 ret =3D iov_send(socket, iov, 2, 0, sizeof(len) + sizeof(test)); g_assert_cmpint(ret, =3D=3D, 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 t= o * ensure the packet data gets queued in QEMU, before we do 'cont'. */ - qmp("{ 'execute' : 'query-status'}"); - qmp("{ 'execute' : 'cont'}"); + resp =3D qmp("{ 'execute' : 'query-status'}"); + QDECREF(resp); + resp =3D qmp("{ 'execute' : 'cont'}"); + QDECREF(resp); =20 qvirtio_wait_queue_isr(bus, dev, vq, QVIRTIO_NET_TIMEOUT_US); memread(req_addr + VNET_HDR_SIZE, buffer, sizeof(test)); --=20 2.9.0