Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/812506/?format=api
{ "id": 812506, "url": "http://patchwork.ozlabs.org/api/patches/812506/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911172022.4738-27-eblake@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170911172022.4738-27-eblake@redhat.com>", "list_archive_url": null, "date": "2017-09-11T17:20:10", "name": "[v7,26/38] libqtest: Merge qtest_end() into qtest_quit()", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "25f22d94b315208cbd1e7d05fe223121ff6ea857", "submitter": { "id": 6591, "url": "http://patchwork.ozlabs.org/api/people/6591/?format=api", "name": "Eric Blake", "email": "eblake@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911172022.4738-27-eblake@redhat.com/mbox/", "series": [ { "id": 2534, "url": "http://patchwork.ozlabs.org/api/series/2534/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2534", "date": "2017-09-11T17:19:47", "name": "Preliminary libqtest cleanups", "version": 7, "mbox": "http://patchwork.ozlabs.org/series/2534/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/812506/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/812506/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)", "ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=eblake@redhat.com" ], "Received": [ "from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xrb8V6StFz9s7F\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 12 Sep 2017 03:51:38 +1000 (AEST)", "from localhost ([::1]:59485 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1drSrw-0001lw-Ub\n\tfor incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 13:51:37 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:38915)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1drSP3-0007xh-7A\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 13:21:51 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1drSP0-0001SI-7q\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 13:21:45 -0400", "from mx1.redhat.com ([209.132.183.28]:40852)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <eblake@redhat.com>)\n\tid 1drSOr-0001PZ-OV; Mon, 11 Sep 2017 13:21:33 -0400", "from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id B09D940985B;\n\tMon, 11 Sep 2017 17:21:32 +0000 (UTC)", "from red.redhat.com (ovpn-120-44.rdu2.redhat.com [10.10.120.44])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 37EB0612A4;\n\tMon, 11 Sep 2017 17:21:22 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com B09D940985B", "From": "Eric Blake <eblake@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Mon, 11 Sep 2017 12:20:10 -0500", "Message-Id": "<20170911172022.4738-27-eblake@redhat.com>", "In-Reply-To": "<20170911172022.4738-1-eblake@redhat.com>", "References": "<20170911172022.4738-1-eblake@redhat.com>", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.14", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tMon, 11 Sep 2017 17:21:33 +0000 (UTC)", "X-detected-operating-system": "by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]", "X-Received-From": "209.132.183.28", "Subject": "[Qemu-devel] [PATCH v7 26/38] libqtest: Merge qtest_end() into\n\tqtest_quit()", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "thuth@redhat.com, \"open list:Floppy\" <qemu-block@nongnu.org>, \"Michael S.\n\tTsirkin\" <mst@redhat.com>, Jason Wang <jasowang@redhat.com>,\n\tAmit Shah <amit@kernel.org>, armbru@redhat.com,\n\tAlexander Graf <agraf@suse.de>, \tKeith Busch <keith.busch@intel.com>,\n\t\"open list:sPAPR\"\n\t<qemu-ppc@nongnu.org>, Gerd Hoffmann <kraxel@redhat.com>, Stefan\n\tHajnoczi <stefanha@redhat.com>, pbonzini@redhat.com, John Snow\n\t<jsnow@redhat.com>, =?utf-8?q?Andreas_F=C3=A4rber?= <afaerber@suse.de>,\n\t\"Dr. David Alan Gilbert\" <dgilbert@redhat.com>, David Gibson\n\t<david@gibson.dropbear.id.au>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "Rather than have two similar shutdown functions, where one requires\nthe use of global_qtest in the header, it is better to have a single\nshutdown function that still takes care of cleaning up global_qtest\nif it is set. All callers are updated.\n\nSigned-off-by: Eric Blake <eblake@redhat.com>\n---\n tests/libqtest.h | 11 -----------\n tests/libqtest.c | 6 +++++-\n tests/ac97-test.c | 2 +-\n tests/device-introspect-test.c | 12 ++++++------\n tests/display-vga-test.c | 12 ++++++------\n tests/drive_del-test.c | 6 +++---\n tests/e1000e-test.c | 4 ++--\n tests/es1370-test.c | 2 +-\n tests/fdc-test.c | 2 +-\n tests/hd-geo-test.c | 8 ++++----\n tests/i440fx-test.c | 6 +++---\n tests/i82801b11-test.c | 2 +-\n tests/ide-test.c | 2 +-\n tests/intel-hda-test.c | 4 ++--\n tests/ioh3420-test.c | 2 +-\n tests/ipoctal232-test.c | 2 +-\n tests/ne2000-test.c | 2 +-\n tests/numa-test.c | 14 +++++++-------\n tests/nvme-test.c | 2 +-\n tests/pc-cpu-test.c | 4 ++--\n tests/pcnet-test.c | 2 +-\n tests/pvpanic-test.c | 2 +-\n tests/q35-test.c | 4 ++--\n tests/qmp-test.c | 4 ++--\n tests/qom-test.c | 2 +-\n tests/rtl8139-test.c | 2 +-\n tests/spapr-phb-test.c | 2 +-\n tests/tco-test.c | 2 +-\n tests/test-arm-mptimer.c | 2 +-\n tests/test-filter-mirror.c | 2 +-\n tests/test-filter-redirector.c | 4 ++--\n tests/test-hmp.c | 2 +-\n tests/test-netfilter.c | 2 +-\n tests/test-x86-cpuid-compat.c | 6 +++---\n tests/tpci200-test.c | 2 +-\n tests/usb-hcd-ehci-test.c | 2 +-\n tests/usb-hcd-ohci-test.c | 2 +-\n tests/usb-hcd-xhci-test.c | 2 +-\n tests/virtio-balloon-test.c | 2 +-\n tests/virtio-blk-test.c | 2 +-\n tests/virtio-console-test.c | 4 ++--\n tests/virtio-net-test.c | 2 +-\n tests/virtio-rng-test.c | 2 +-\n tests/virtio-serial-test.c | 2 +-\n tests/vmxnet3-test.c | 2 +-\n 45 files changed, 80 insertions(+), 87 deletions(-)", "diff": "diff --git a/tests/libqtest.h b/tests/libqtest.h\nindex 3ae570927a..d976a542b8 100644\n--- a/tests/libqtest.h\n+++ b/tests/libqtest.h\n@@ -523,17 +523,6 @@ static inline QTestState *qtest_start(const char *args)\n }\n\n /**\n- * qtest_end:\n- *\n- * Shut down the QEMU process started by qtest_start().\n- */\n-static inline void qtest_end(void)\n-{\n- qtest_quit(global_qtest);\n- global_qtest = NULL;\n-}\n-\n-/**\n * qmp:\n * @fmt...: QMP message to send to qemu\n *\ndiff --git a/tests/libqtest.c b/tests/libqtest.c\nindex 1710d63276..94c157ce02 100644\n--- a/tests/libqtest.c\n+++ b/tests/libqtest.c\n@@ -246,6 +246,10 @@ QTestState *qtest_init(const char *extra_args)\n\n void qtest_quit(QTestState *s)\n {\n+ if (global_qtest) {\n+ assert(s == global_qtest);\n+ global_qtest = NULL;\n+ }\n g_hook_destroy_link(&abrt_hooks, g_hook_find_data(&abrt_hooks, TRUE, s));\n\n /* Uninstall SIGABRT handler on last instance */\n@@ -979,6 +983,6 @@ void qtest_cb_for_every_machine(void (*cb)(const char *machine))\n cb(mname);\n }\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n QDECREF(response);\n }\ndiff --git a/tests/ac97-test.c b/tests/ac97-test.c\nindex e0d177bd9c..ca9b3dce88 100644\n--- a/tests/ac97-test.c\n+++ b/tests/ac97-test.c\n@@ -25,7 +25,7 @@ int main(int argc, char **argv)\n qtest_start(\"-device AC97\");\n ret = g_test_run();\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n\n return ret;\n }\ndiff --git a/tests/device-introspect-test.c b/tests/device-introspect-test.c\nindex f7162c023f..b3227bd950 100644\n--- a/tests/device-introspect-test.c\n+++ b/tests/device-introspect-test.c\n@@ -134,7 +134,7 @@ static void test_device_intro_list(void)\n help = hmp(\"device_add help\");\n g_free(help);\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n /*\n@@ -189,21 +189,21 @@ static void test_qom_list_fields(void)\n\n QDECREF(all_types);\n QDECREF(non_abstract);\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n static void test_device_intro_none(void)\n {\n qtest_start(common_args);\n test_one_device(\"nonexistent\");\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n static void test_device_intro_abstract(void)\n {\n qtest_start(common_args);\n test_one_device(\"device\");\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n static void test_device_intro_concrete(void)\n@@ -223,7 +223,7 @@ static void test_device_intro_concrete(void)\n }\n\n QDECREF(types);\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n static void test_abstract_interfaces(void)\n@@ -257,7 +257,7 @@ static void test_abstract_interfaces(void)\n\n QDECREF(all_types);\n QDECREF(index);\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n int main(int argc, char **argv)\ndiff --git a/tests/display-vga-test.c b/tests/display-vga-test.c\nindex 2d7d24eee0..8667330e3c 100644\n--- a/tests/display-vga-test.c\n+++ b/tests/display-vga-test.c\n@@ -13,38 +13,38 @@\n static void pci_cirrus(void)\n {\n qtest_start(\"-vga none -device cirrus-vga\");\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n static void pci_stdvga(void)\n {\n qtest_start(\"-vga none -device VGA\");\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n static void pci_secondary(void)\n {\n qtest_start(\"-vga none -device secondary-vga\");\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n static void pci_multihead(void)\n {\n qtest_start(\"-vga none -device VGA -device secondary-vga\");\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n static void pci_virtio_gpu(void)\n {\n qtest_start(\"-vga none -device virtio-gpu-pci\");\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n #ifdef CONFIG_VIRTIO_VGA\n static void pci_virtio_vga(void)\n {\n qtest_start(\"-vga none -device virtio-vga\");\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n #endif\n\ndiff --git a/tests/drive_del-test.c b/tests/drive_del-test.c\nindex 2175139abb..16d256fe64 100644\n--- a/tests/drive_del-test.c\n+++ b/tests/drive_del-test.c\n@@ -55,7 +55,7 @@ static void test_drive_without_dev(void)\n */\n drive_add();\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n static void test_after_failed_device_add(void)\n@@ -86,7 +86,7 @@ static void test_after_failed_device_add(void)\n */\n drive_add();\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n static void test_drive_del_device_del(void)\n@@ -103,7 +103,7 @@ static void test_drive_del_device_del(void)\n drive_del();\n device_del();\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n int main(int argc, char **argv)\ndiff --git a/tests/e1000e-test.c b/tests/e1000e-test.c\nindex 8645485c19..98f821fa7b 100644\n--- a/tests/e1000e-test.c\n+++ b/tests/e1000e-test.c\n@@ -408,7 +408,7 @@ static void data_test_clear(e1000e_device *d)\n pc_alloc_uninit(test_alloc);\n g_free(d->pci_dev);\n qpci_free_pc(test_bus);\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n static void test_e1000e_init(gconstpointer data)\n@@ -463,7 +463,7 @@ static void test_e1000e_hotplug(gconstpointer data)\n qpci_plug_device_test(global_qtest, \"e1000e\", \"e1000e_net\", slot, NULL);\n qpci_unplug_device_test(global_qtest, \"e1000e_net\", slot);\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n int main(int argc, char **argv)\ndiff --git a/tests/es1370-test.c b/tests/es1370-test.c\nindex 199fe193ce..5578ff94fa 100644\n--- a/tests/es1370-test.c\n+++ b/tests/es1370-test.c\n@@ -25,7 +25,7 @@ int main(int argc, char **argv)\n qtest_start(\"-device ES1370\");\n ret = g_test_run();\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n\n return ret;\n }\ndiff --git a/tests/fdc-test.c b/tests/fdc-test.c\nindex 325712e0f2..e63e93179a 100644\n--- a/tests/fdc-test.c\n+++ b/tests/fdc-test.c\n@@ -583,7 +583,7 @@ int main(int argc, char **argv)\n ret = g_test_run();\n\n /* Cleanup */\n- qtest_end();\n+ qtest_quit(global_qtest);\n unlink(test_image);\n\n return ret;\ndiff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c\nindex 24870b38f4..67d571ef13 100644\n--- a/tests/hd-geo-test.c\n+++ b/tests/hd-geo-test.c\n@@ -245,7 +245,7 @@ static void test_ide_none(void)\n g_strfreev(argv);\n g_free(args);\n test_cmos();\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n static void test_ide_mbr(bool use_device, MBRcontents mbr)\n@@ -267,7 +267,7 @@ static void test_ide_mbr(bool use_device, MBRcontents mbr)\n g_strfreev(argv);\n g_free(args);\n test_cmos();\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n /*\n@@ -343,7 +343,7 @@ static void test_ide_drive_user(const char *dev, bool trans)\n g_strfreev(argv);\n g_free(args);\n test_cmos();\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n /*\n@@ -400,7 +400,7 @@ static void test_ide_drive_cd_0(void)\n g_strfreev(argv);\n g_free(args);\n test_cmos();\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n int main(int argc, char **argv)\ndiff --git a/tests/i440fx-test.c b/tests/i440fx-test.c\nindex 4390e5591e..c847e4dbbb 100644\n--- a/tests/i440fx-test.c\n+++ b/tests/i440fx-test.c\n@@ -136,7 +136,7 @@ static void test_i440fx_defaults(gconstpointer opaque)\n\n g_free(dev);\n qpci_free_pc(bus);\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n #define PAM_RE 1\n@@ -275,7 +275,7 @@ static void test_i440fx_pam(gconstpointer opaque)\n\n g_free(dev);\n qpci_free_pc(bus);\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n #define BLOB_SIZE ((size_t)65536)\n@@ -373,7 +373,7 @@ static void test_i440fx_firmware(FirmwareTestFixture *fixture,\n }\n\n g_free(buf);\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n static void add_firmware_test(const char *testpath,\ndiff --git a/tests/i82801b11-test.c b/tests/i82801b11-test.c\nindex a6e31594c9..0c94876626 100644\n--- a/tests/i82801b11-test.c\n+++ b/tests/i82801b11-test.c\n@@ -25,7 +25,7 @@ int main(int argc, char **argv)\n qtest_start(\"-machine q35 -device i82801b11-bridge,bus=pcie.0,addr=1e.0\");\n ret = g_test_run();\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n\n return ret;\n }\ndiff --git a/tests/ide-test.c b/tests/ide-test.c\nindex 084f6a5f96..16b73e0101 100644\n--- a/tests/ide-test.c\n+++ b/tests/ide-test.c\n@@ -134,7 +134,7 @@ static void ide_test_quit(void)\n {\n pc_alloc_uninit(guest_malloc);\n guest_malloc = NULL;\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n static QPCIDevice *get_pci_device(QPCIBar *bmdma_bar, QPCIBar *ide_bar)\ndiff --git a/tests/intel-hda-test.c b/tests/intel-hda-test.c\nindex b782b2e944..ce24fbac1f 100644\n--- a/tests/intel-hda-test.c\n+++ b/tests/intel-hda-test.c\n@@ -19,14 +19,14 @@\n static void ich6_test(void)\n {\n qtest_start(\"-device intel-hda,id=\" HDA_ID CODEC_DEVICES);\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n static void ich9_test(void)\n {\n qtest_start(\"-machine q35 -device ich9-intel-hda,bus=pcie.0,addr=1b.0,id=\"\n HDA_ID CODEC_DEVICES);\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n int main(int argc, char **argv)\ndiff --git a/tests/ioh3420-test.c b/tests/ioh3420-test.c\nindex b54c4b9f11..f2ca373e87 100644\n--- a/tests/ioh3420-test.c\n+++ b/tests/ioh3420-test.c\n@@ -26,7 +26,7 @@ int main(int argc, char **argv)\n \"chassis=1,multifunction=on\");\n ret = g_test_run();\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n\n return ret;\n }\ndiff --git a/tests/ipoctal232-test.c b/tests/ipoctal232-test.c\nindex 684914164d..d17a93449f 100644\n--- a/tests/ipoctal232-test.c\n+++ b/tests/ipoctal232-test.c\n@@ -25,7 +25,7 @@ int main(int argc, char **argv)\n qtest_start(\"-device tpci200,id=ipack0 -device ipoctal232,bus=ipack0.0\");\n ret = g_test_run();\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n\n return ret;\n }\ndiff --git a/tests/ne2000-test.c b/tests/ne2000-test.c\nindex b7cf3dd2f5..cae83c5c4c 100644\n--- a/tests/ne2000-test.c\n+++ b/tests/ne2000-test.c\n@@ -25,7 +25,7 @@ int main(int argc, char **argv)\n qtest_start(\"-device ne2k_pci\");\n ret = g_test_run();\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n\n return ret;\n }\ndiff --git a/tests/numa-test.c b/tests/numa-test.c\nindex e1b6152244..fa21d26935 100644\n--- a/tests/numa-test.c\n+++ b/tests/numa-test.c\n@@ -32,7 +32,7 @@ static void test_mon_explicit(const void *data)\n g_assert(strstr(s, \"node 1 cpus: 4 5 6 7\"));\n g_free(s);\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n g_free(cli);\n }\n\n@@ -49,7 +49,7 @@ static void test_mon_default(const void *data)\n g_assert(strstr(s, \"node 1 cpus: 1 3 5 7\"));\n g_free(s);\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n g_free(cli);\n }\n\n@@ -68,7 +68,7 @@ static void test_mon_partial(const void *data)\n g_assert(strstr(s, \"node 1 cpus: 4 5\"));\n g_free(s);\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n g_free(cli);\n }\n\n@@ -113,7 +113,7 @@ static void test_query_cpus(const void *data)\n }\n\n QDECREF(resp);\n- qtest_end();\n+ qtest_quit(global_qtest);\n g_free(cli);\n }\n\n@@ -166,7 +166,7 @@ static void pc_numa_cpu(const void *data)\n }\n\n QDECREF(resp);\n- qtest_end();\n+ qtest_quit(global_qtest);\n g_free(cli);\n }\n\n@@ -211,7 +211,7 @@ static void spapr_numa_cpu(const void *data)\n }\n\n QDECREF(resp);\n- qtest_end();\n+ qtest_quit(global_qtest);\n g_free(cli);\n }\n\n@@ -254,7 +254,7 @@ static void aarch64_numa_cpu(const void *data)\n }\n\n QDECREF(resp);\n- qtest_end();\n+ qtest_quit(global_qtest);\n g_free(cli);\n }\n\ndiff --git a/tests/nvme-test.c b/tests/nvme-test.c\nindex 7674a446e4..3d6c0f39cf 100644\n--- a/tests/nvme-test.c\n+++ b/tests/nvme-test.c\n@@ -26,7 +26,7 @@ int main(int argc, char **argv)\n \"-device nvme,drive=drv0,serial=foo\");\n ret = g_test_run();\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n\n return ret;\n }\ndiff --git a/tests/pc-cpu-test.c b/tests/pc-cpu-test.c\nindex c4211a4e85..3ff7115625 100644\n--- a/tests/pc-cpu-test.c\n+++ b/tests/pc-cpu-test.c\n@@ -44,7 +44,7 @@ static void test_pc_with_cpu_add(gconstpointer data)\n QDECREF(response);\n }\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n g_free(args);\n }\n\n@@ -67,7 +67,7 @@ static void test_pc_without_cpu_add(gconstpointer data)\n g_assert(qdict_haskey(response, \"error\"));\n QDECREF(response);\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n g_free(args);\n }\n\ndiff --git a/tests/pcnet-test.c b/tests/pcnet-test.c\nindex efb1ef44e9..98246d3504 100644\n--- a/tests/pcnet-test.c\n+++ b/tests/pcnet-test.c\n@@ -25,7 +25,7 @@ int main(int argc, char **argv)\n qtest_start(\"-device pcnet\");\n ret = g_test_run();\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n\n return ret;\n }\ndiff --git a/tests/pvpanic-test.c b/tests/pvpanic-test.c\nindex 71ebb5c02c..5d99b3d9e2 100644\n--- a/tests/pvpanic-test.c\n+++ b/tests/pvpanic-test.c\n@@ -40,7 +40,7 @@ int main(int argc, char **argv)\n qtest_start(\"-device pvpanic\");\n ret = g_test_run();\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n\n return ret;\n }\ndiff --git a/tests/q35-test.c b/tests/q35-test.c\nindex e149c4c51d..a8e24e5b71 100644\n--- a/tests/q35-test.c\n+++ b/tests/q35-test.c\n@@ -119,7 +119,7 @@ static void test_smram_lock(void)\n g_free(pcidev);\n qpci_free_pc(pcibus);\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n static void test_tseg_size(const void *data)\n@@ -185,7 +185,7 @@ static void test_tseg_size(const void *data)\n\n g_free(pcidev);\n qpci_free_pc(pcibus);\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n int main(int argc, char **argv)\ndiff --git a/tests/qmp-test.c b/tests/qmp-test.c\nindex 4e6198c9fa..a31c0f7de1 100644\n--- a/tests/qmp-test.c\n+++ b/tests/qmp-test.c\n@@ -188,7 +188,7 @@ static void test_query(const void *data)\n }\n QDECREF(resp);\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n static bool query_is_blacklisted(const char *cmd)\n@@ -232,7 +232,7 @@ static void qmp_schema_init(QmpSchema *schema)\n visit_free(qiv);\n\n QDECREF(resp);\n- qtest_end();\n+ qtest_quit(global_qtest);\n\n schema->hash = g_hash_table_new(g_str_hash, g_str_equal);\n\ndiff --git a/tests/qom-test.c b/tests/qom-test.c\nindex ab0595dc75..661a6edefd 100644\n--- a/tests/qom-test.c\n+++ b/tests/qom-test.c\n@@ -102,7 +102,7 @@ static void test_machine(gconstpointer data)\n g_assert(qdict_haskey(response, \"return\"));\n QDECREF(response);\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n g_free(args);\n g_free((void *)machine);\n }\ndiff --git a/tests/rtl8139-test.c b/tests/rtl8139-test.c\nindex 68bfc42178..317eb586b5 100644\n--- a/tests/rtl8139-test.c\n+++ b/tests/rtl8139-test.c\n@@ -205,7 +205,7 @@ int main(int argc, char **argv)\n\n ret = g_test_run();\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n\n return ret;\n }\ndiff --git a/tests/spapr-phb-test.c b/tests/spapr-phb-test.c\nindex d3522ea093..e76987ace9 100644\n--- a/tests/spapr-phb-test.c\n+++ b/tests/spapr-phb-test.c\n@@ -29,7 +29,7 @@ int main(int argc, char **argv)\n\n ret = g_test_run();\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n\n return ret;\n }\ndiff --git a/tests/tco-test.c b/tests/tco-test.c\nindex 0387971953..3d4b3db308 100644\n--- a/tests/tco-test.c\n+++ b/tests/tco-test.c\n@@ -49,7 +49,7 @@ static void test_end(TestData *d)\n {\n g_free(d->dev);\n qpci_free_pc(d->bus);\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n static void test_init(TestData *d)\ndiff --git a/tests/test-arm-mptimer.c b/tests/test-arm-mptimer.c\nindex cb8f2df914..823db9ebc9 100644\n--- a/tests/test-arm-mptimer.c\n+++ b/tests/test-arm-mptimer.c\n@@ -1099,7 +1099,7 @@ tests_with_prescaler_arg:\n\n qtest_start(\"-machine vexpress-a9\");\n ret = g_test_run();\n- qtest_end();\n+ qtest_quit(global_qtest);\n\n return ret;\n }\ndiff --git a/tests/test-filter-mirror.c b/tests/test-filter-mirror.c\nindex d569d27657..85fb38976d 100644\n--- a/tests/test-filter-mirror.c\n+++ b/tests/test-filter-mirror.c\n@@ -86,7 +86,7 @@ int main(int argc, char **argv)\n\n qtest_add_func(\"/netfilter/mirror\", test_mirror);\n ret = g_test_run();\n- qtest_end();\n+ qtest_quit(global_qtest);\n\n return ret;\n }\ndiff --git a/tests/test-filter-redirector.c b/tests/test-filter-redirector.c\nindex 3afd41110d..d3a0b1cdf4 100644\n--- a/tests/test-filter-redirector.c\n+++ b/tests/test-filter-redirector.c\n@@ -135,7 +135,7 @@ static void test_redirector_tx(void)\n close(recv_sock);\n unlink(sock_path0);\n unlink(sock_path1);\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n static void test_redirector_rx(void)\n@@ -204,7 +204,7 @@ static void test_redirector_rx(void)\n g_free(recv_buf);\n unlink(sock_path0);\n unlink(sock_path1);\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n int main(int argc, char **argv)\ndiff --git a/tests/test-hmp.c b/tests/test-hmp.c\nindex 729c0339f7..752f4b63bd 100644\n--- a/tests/test-hmp.c\n+++ b/tests/test-hmp.c\n@@ -127,7 +127,7 @@ static void test_machine(gconstpointer data)\n test_info_commands();\n test_commands();\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n g_free(args);\n g_free((void *)data);\n }\ndiff --git a/tests/test-netfilter.c b/tests/test-netfilter.c\nindex 2506473365..ffb11dbfb7 100644\n--- a/tests/test-netfilter.c\n+++ b/tests/test-netfilter.c\n@@ -202,7 +202,7 @@ int main(int argc, char **argv)\n qtest_start(args);\n ret = g_test_run();\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n g_free(args);\n\n return ret;\ndiff --git a/tests/test-x86-cpuid-compat.c b/tests/test-x86-cpuid-compat.c\nindex 58a2dd9fe8..4e88f9e4e2 100644\n--- a/tests/test-x86-cpuid-compat.c\n+++ b/tests/test-x86-cpuid-compat.c\n@@ -64,7 +64,7 @@ static void test_cpuid_prop(const void *data)\n value = qobject_to_qnum(qom_get(path, args->property));\n g_assert(qnum_get_try_int(value, &val));\n g_assert_cmpint(val, ==, args->expected_value);\n- qtest_end();\n+ qtest_quit(global_qtest);\n\n QDECREF(value);\n g_free(path);\n@@ -137,7 +137,7 @@ static void test_feature_flag(const void *data)\n filtered = qobject_to_qlist(qom_get(path, \"filtered-features\"));\n value = get_feature_word(present, args->in_eax, args->in_ecx, args->reg);\n value |= get_feature_word(filtered, args->in_eax, args->in_ecx, args->reg);\n- qtest_end();\n+ qtest_quit(global_qtest);\n\n g_assert(!!(value & (1U << args->bitnr)) == args->expected_value);\n\n@@ -195,7 +195,7 @@ static void test_plus_minus_subprocess(void)\n g_assert_true(qom_get_bool(path, \"sse4-2\"));\n g_assert_true(qom_get_bool(path, \"sse4.2\"));\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n g_free(path);\n }\n\ndiff --git a/tests/tpci200-test.c b/tests/tpci200-test.c\nindex 0321ec27ec..3b756d10f0 100644\n--- a/tests/tpci200-test.c\n+++ b/tests/tpci200-test.c\n@@ -25,7 +25,7 @@ int main(int argc, char **argv)\n qtest_start(\"-device tpci200\");\n ret = g_test_run();\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n\n return ret;\n }\ndiff --git a/tests/usb-hcd-ehci-test.c b/tests/usb-hcd-ehci-test.c\nindex 55d4743a2a..16d74512cc 100644\n--- a/tests/usb-hcd-ehci-test.c\n+++ b/tests/usb-hcd-ehci-test.c\n@@ -172,7 +172,7 @@ int main(int argc, char **argv)\n ret = g_test_run();\n test_deinit();\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n\n return ret;\n }\ndiff --git a/tests/usb-hcd-ohci-test.c b/tests/usb-hcd-ohci-test.c\nindex 4758813d78..aa38e44d03 100644\n--- a/tests/usb-hcd-ohci-test.c\n+++ b/tests/usb-hcd-ohci-test.c\n@@ -33,7 +33,7 @@ int main(int argc, char **argv)\n\n qtest_start(\"-device pci-ohci,id=ohci\");\n ret = g_test_run();\n- qtest_end();\n+ qtest_quit(global_qtest);\n\n return ret;\n }\ndiff --git a/tests/usb-hcd-xhci-test.c b/tests/usb-hcd-xhci-test.c\nindex c05a339894..e45509741c 100644\n--- a/tests/usb-hcd-xhci-test.c\n+++ b/tests/usb-hcd-xhci-test.c\n@@ -83,7 +83,7 @@ int main(int argc, char **argv)\n qtest_start(\"-device nec-usb-xhci,id=xhci\"\n \" -drive id=drive0,if=none,file=null-co://,format=raw\");\n ret = g_test_run();\n- qtest_end();\n+ qtest_quit(global_qtest);\n\n return ret;\n }\ndiff --git a/tests/virtio-balloon-test.c b/tests/virtio-balloon-test.c\nindex 0d0046bf25..34ad718601 100644\n--- a/tests/virtio-balloon-test.c\n+++ b/tests/virtio-balloon-test.c\n@@ -25,7 +25,7 @@ int main(int argc, char **argv)\n qtest_start(\"-device virtio-balloon-pci\");\n ret = g_test_run();\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n\n return ret;\n }\ndiff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c\nindex 0cf33b6810..ce316e753e 100644\n--- a/tests/virtio-blk-test.c\n+++ b/tests/virtio-blk-test.c\n@@ -102,7 +102,7 @@ static void arm_test_start(void)\n\n static void test_end(void)\n {\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n static QVirtioPCIDevice *virtio_blk_pci_init(QPCIBus *bus, int slot)\ndiff --git a/tests/virtio-console-test.c b/tests/virtio-console-test.c\nindex 1c3de072f4..5c036ce02a 100644\n--- a/tests/virtio-console-test.c\n+++ b/tests/virtio-console-test.c\n@@ -15,14 +15,14 @@ static void console_pci_nop(void)\n {\n qtest_start(\"-device virtio-serial-pci,id=vser0 \"\n \"-device virtconsole,bus=vser0.0\");\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n static void serialport_pci_nop(void)\n {\n qtest_start(\"-device virtio-serial-pci,id=vser0 \"\n \"-device virtserialport,bus=vser0.0\");\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n int main(int argc, char **argv)\ndiff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c\nindex acecef0a3e..e1085c7e77 100644\n--- a/tests/virtio-net-test.c\n+++ b/tests/virtio-net-test.c\n@@ -30,7 +30,7 @@\n\n static void test_end(void)\n {\n- qtest_end();\n+ qtest_quit(global_qtest);\n }\n\n #ifndef _WIN32\ndiff --git a/tests/virtio-rng-test.c b/tests/virtio-rng-test.c\nindex 0e21125cb4..a3a8bde491 100644\n--- a/tests/virtio-rng-test.c\n+++ b/tests/virtio-rng-test.c\n@@ -41,7 +41,7 @@ int main(int argc, char **argv)\n qtest_start(\"-device virtio-rng-pci\");\n ret = g_test_run();\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n\n return ret;\n }\ndiff --git a/tests/virtio-serial-test.c b/tests/virtio-serial-test.c\nindex b14d943ada..d0bbc2a8c9 100644\n--- a/tests/virtio-serial-test.c\n+++ b/tests/virtio-serial-test.c\n@@ -52,7 +52,7 @@ int main(int argc, char **argv)\n qtest_start(\"-device virtio-serial-pci\");\n ret = g_test_run();\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n\n return ret;\n }\ndiff --git a/tests/vmxnet3-test.c b/tests/vmxnet3-test.c\nindex 159c0ad728..631630b4d0 100644\n--- a/tests/vmxnet3-test.c\n+++ b/tests/vmxnet3-test.c\n@@ -25,7 +25,7 @@ int main(int argc, char **argv)\n qtest_start(\"-device vmxnet3\");\n ret = g_test_run();\n\n- qtest_end();\n+ qtest_quit(global_qtest);\n\n return ret;\n }\n", "prefixes": [ "v7", "26/38" ] }