Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/808925/?format=api
{ "id": 808925, "url": "http://patchwork.ozlabs.org/api/patches/808925/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901180340.30009-30-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": "<20170901180340.30009-30-eblake@redhat.com>", "list_archive_url": null, "date": "2017-09-01T18:03:40", "name": "[v6,29/29] libqtest: Rename qtest_init() to qtest_start()", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "e0ba163550cf884ae8f79175861cf3dc86aecab2", "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/20170901180340.30009-30-eblake@redhat.com/mbox/", "series": [ { "id": 1089, "url": "http://patchwork.ozlabs.org/api/series/1089/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1089", "date": "2017-09-01T18:03:12", "name": "Preliminary libqtest cleanups", "version": 6, "mbox": "http://patchwork.ozlabs.org/series/1089/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/808925/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/808925/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-mx04.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx04.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 3xkS7n1dwzz9sMN\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 2 Sep 2017 04:14:45 +1000 (AEST)", "from localhost ([::1]:53141 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 1dnqSp-00008p-77\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 14:14:43 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:57019)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1dnqJh-0008O9-5b\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 14:05:22 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1dnqJS-0002VC-Pt\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 14:05:17 -0400", "from mx1.redhat.com ([209.132.183.28]:54524)\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 1dnqJ9-0002Gd-9N; Fri, 01 Sep 2017 14:04:43 -0400", "from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\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 33BFB821C3;\n\tFri, 1 Sep 2017 18:04:42 +0000 (UTC)", "from red.redhat.com (ovpn-121-149.rdu2.redhat.com [10.10.121.149])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 7C725627DE;\n\tFri, 1 Sep 2017 18:04:37 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 33BFB821C3", "From": "Eric Blake <eblake@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Fri, 1 Sep 2017 13:03:40 -0500", "Message-Id": "<20170901180340.30009-30-eblake@redhat.com>", "In-Reply-To": "<20170901180340.30009-1-eblake@redhat.com>", "References": "<20170901180340.30009-1-eblake@redhat.com>", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.15", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.28]);\n\tFri, 01 Sep 2017 18:04:42 +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 v6 29/29] libqtest: Rename qtest_init() to\n\tqtest_start()", "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": "Thomas Huth <thuth@redhat.com>,\n\t\"open list:Floppy\" <qemu-block@nongnu.org>, Ben Warren\n\t<ben@skyportsystems.com>, \"Michael S. Tsirkin\" <mst@redhat.com>, \n\tJason Wang <jasowang@redhat.com>, Amit Shah <amit@kernel.org>, \n\tarmbru@redhat.com, Alexander Graf <agraf@suse.de>, \n\tKeith Busch <keith.busch@intel.com>, \"open list:sPAPR\"\n\t<qemu-ppc@nongnu.org>, Gerd Hoffmann <kraxel@redhat.com>, Stefan\n\tHajnoczi <stefanha@redhat.com>, Igor Mammedov <imammedo@redhat.com>,\n\tpbonzini@redhat.com, \tJohn Snow <jsnow@redhat.com>,\n\t=?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": "We already have another qtest_init() in the tree, for the\ntop-level qtest.c device; having two functions with different\nsignatures is confusing. Rename the libqtest version to\nqtest_start() to eliminate the duplication.\n\nSigned-off-by: Eric Blake <eblake@redhat.com>\n---\n tests/libqtest.h | 8 ++++----\n tests/libqtest.c | 8 ++++----\n tests/ac97-test.c | 2 +-\n tests/bios-tables-test.c | 12 ++++++------\n tests/boot-order-test.c | 8 ++++----\n tests/boot-serial-test.c | 8 ++++----\n tests/device-introspect-test.c | 12 ++++++------\n tests/display-vga-test.c | 12 ++++++------\n tests/drive_del-test.c | 6 +++---\n tests/ds1338-test.c | 2 +-\n tests/e1000-test.c | 2 +-\n tests/e1000e-test.c | 6 +++---\n tests/eepro100-test.c | 2 +-\n tests/endianness-test.c | 24 ++++++++++++------------\n tests/es1370-test.c | 2 +-\n tests/fdc-test.c | 2 +-\n tests/fw_cfg-test.c | 2 +-\n tests/hd-geo-test.c | 8 ++++----\n tests/i440fx-test.c | 6 +++---\n tests/i82801b11-test.c | 4 ++--\n tests/ide-test.c | 2 +-\n tests/intel-hda-test.c | 4 ++--\n tests/ioh3420-test.c | 2 +-\n tests/ipmi-bt-test.c | 2 +-\n tests/ipmi-kcs-test.c | 4 ++--\n tests/ipoctal232-test.c | 4 ++--\n tests/ivshmem-test.c | 2 +-\n tests/libqos/libqos.c | 2 +-\n tests/m25p80-test.c | 6 +++---\n tests/m48t59-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 | 16 ++++++++--------\n tests/pcnet-test.c | 2 +-\n tests/pnv-xscom-test.c | 4 ++--\n tests/postcopy-test.c | 4 ++--\n tests/prom-env-test.c | 10 +++++-----\n tests/pvpanic-test.c | 2 +-\n tests/pxe-test.c | 10 +++++-----\n tests/q35-test.c | 4 ++--\n tests/qmp-test.c | 2 +-\n tests/qom-test.c | 2 +-\n tests/rtc-test.c | 2 +-\n tests/rtl8139-test.c | 2 +-\n tests/spapr-phb-test.c | 4 ++--\n tests/tco-test.c | 6 +++---\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 | 4 ++--\n tests/test-x86-cpuid-compat.c | 8 ++++----\n tests/tmp105-test.c | 7 ++++---\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 | 5 +++--\n tests/vhost-user-test.c | 22 +++++++++++-----------\n tests/virtio-balloon-test.c | 2 +-\n tests/virtio-blk-test.c | 8 ++++----\n tests/virtio-console-test.c | 8 ++++----\n tests/virtio-net-test.c | 2 +-\n tests/virtio-rng-test.c | 2 +-\n tests/virtio-serial-test.c | 2 +-\n tests/vmgenid-test.c | 6 +++---\n tests/vmxnet3-test.c | 2 +-\n tests/wdt_ib700-test.c | 8 ++++----\n 68 files changed, 179 insertions(+), 177 deletions(-)", "diff": "diff --git a/tests/libqtest.h b/tests/libqtest.h\nindex 0459526187..3f6c71f0e3 100644\n--- a/tests/libqtest.h\n+++ b/tests/libqtest.h\n@@ -24,21 +24,21 @@ typedef struct QTestState QTestState;\n extern QTestState *global_qtest;\n\n /**\n- * qtest_init:\n+ * qtest_start:\n * @extra_args...: other arguments to pass to QEMU, formatted as if by\n * sprintf().\n *\n * Returns: #QTestState instance.\n */\n-QTestState *qtest_init(const char *extra_args, ...) GCC_FMT_ATTR(1, 2);\n+QTestState *qtest_start(const char *extra_args, ...) GCC_FMT_ATTR(1, 2);\n\n /**\n- * qtest_init_without_qmp_handshake:\n+ * qtest_start_without_qmp_handshake:\n * @extra_args: other arguments to pass to QEMU.\n *\n * Returns: #QTestState instance.\n */\n-QTestState *qtest_init_without_qmp_handshake(const char *extra_args);\n+QTestState *qtest_start_without_qmp_handshake(const char *extra_args);\n\n /**\n * qtest_quit:\ndiff --git a/tests/libqtest.c b/tests/libqtest.c\nindex fa4e47c137..76c8029f7e 100644\n--- a/tests/libqtest.c\n+++ b/tests/libqtest.c\n@@ -266,7 +266,7 @@ void qtest_add_abrt_handler(GHookFunc fn, const void *data)\n g_hook_prepend(&abrt_hooks, hook);\n }\n\n-QTestState *qtest_init_without_qmp_handshake(const char *extra_args)\n+QTestState *qtest_start_without_qmp_handshake(const char *extra_args)\n {\n QTestState *s;\n int sock, qmpsock, i;\n@@ -347,7 +347,7 @@ QTestState *qtest_init_without_qmp_handshake(const char *extra_args)\n return s;\n }\n\n-QTestState *qtest_init(const char *extra_args, ...)\n+QTestState *qtest_start(const char *extra_args, ...)\n {\n va_list ap;\n QTestState *s;\n@@ -357,7 +357,7 @@ QTestState *qtest_init(const char *extra_args, ...)\n cmd = g_strdup_vprintf(extra_args, ap);\n va_end(ap);\n\n- s = qtest_init_without_qmp_handshake(cmd);\n+ s = qtest_start_without_qmp_handshake(cmd);\n g_free(cmd);\n\n /* Read the QMP greeting and then do the handshake */\n@@ -970,7 +970,7 @@ void qtest_cb_for_every_machine(void (*cb)(const char *machine))\n QString *qstr;\n const char *mname;\n\n- global_qtest = qtest_init(\"-machine none\");\n+ global_qtest = qtest_start(\"-machine none\");\n response = qmp(\"{ 'execute': 'query-machines' }\");\n g_assert(response);\n list = qdict_get_qlist(response, \"return\");\ndiff --git a/tests/ac97-test.c b/tests/ac97-test.c\nindex 6a1edaa85a..2f5fb10632 100644\n--- a/tests/ac97-test.c\n+++ b/tests/ac97-test.c\n@@ -22,7 +22,7 @@ int main(int argc, char **argv)\n g_test_init(&argc, &argv, NULL);\n qtest_add_func(\"/ac97/nop\", nop);\n\n- global_qtest = qtest_init(\"-device AC97\");\n+ global_qtest = qtest_start(\"-device AC97\");\n ret = g_test_run();\n\n qtest_quit(global_qtest);\ndiff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c\nindex f8a107499f..9735073c22 100644\n--- a/tests/bios-tables-test.c\n+++ b/tests/bios-tables-test.c\n@@ -624,12 +624,12 @@ static void test_smbios_structs(test_data *data)\n static void test_acpi_one(const char *params, test_data *data)\n {\n /* Disable kernel irqchip to be able to override apic irq0. */\n- data->qts = qtest_init(\"-machine %s,accel=%s,kernel-irqchip=off \"\n- \"-net none -display none %s \"\n- \"-drive id=hd0,if=none,file=%s,format=raw \"\n- \"-device ide-hd,drive=hd0 \",\n- data->machine, \"kvm:tcg\",\n- params ? params : \"\", disk);\n+ data->qts = qtest_start(\"-machine %s,accel=%s,kernel-irqchip=off \"\n+ \"-net none -display none %s \"\n+ \"-drive id=hd0,if=none,file=%s,format=raw \"\n+ \"-device ide-hd,drive=hd0 \",\n+ data->machine, \"kvm:tcg\",\n+ params ? params : \"\", disk);\n\n boot_sector_test(data->qts);\n\ndiff --git a/tests/boot-order-test.c b/tests/boot-order-test.c\nindex e6efea6852..81b0d32a01 100644\n--- a/tests/boot-order-test.c\n+++ b/tests/boot-order-test.c\n@@ -30,10 +30,10 @@ static void test_a_boot_order(const char *machine,\n {\n uint64_t actual;\n\n- global_qtest = qtest_init(\"-nodefaults%s%s %s\",\n- machine ? \" -M \" : \"\",\n- machine ?: \"\",\n- test_args);\n+ global_qtest = qtest_start(\"-nodefaults%s%s %s\",\n+ machine ? \" -M \" : \"\",\n+ machine ?: \"\",\n+ test_args);\n actual = read_boot_order();\n g_assert_cmphex(actual, ==, expected_boot);\n qmp_discard_response(\"{ 'execute': 'system_reset' }\");\ndiff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c\nindex d7c0c320d7..d337fc9c4b 100644\n--- a/tests/boot-serial-test.c\n+++ b/tests/boot-serial-test.c\n@@ -81,10 +81,10 @@ static void test_machine(const void *data)\n * Make sure that this test uses tcg if available: It is used as a\n * fast-enough smoketest for that.\n */\n- global_qtest = qtest_init(\"-M %s,accel=tcg:kvm \"\n- \"-chardev file,id=serial0,path=%s \"\n- \"-no-shutdown -serial chardev:serial0 %s\",\n- test->machine, tmpname, test->extra);\n+ global_qtest = qtest_start(\"-M %s,accel=tcg:kvm \"\n+ \"-chardev file,id=serial0,path=%s \"\n+ \"-no-shutdown -serial chardev:serial0 %s\",\n+ test->machine, tmpname, test->extra);\n unlink(tmpname);\n\n check_guest_output(test, fd);\ndiff --git a/tests/device-introspect-test.c b/tests/device-introspect-test.c\nindex 1c23b71038..f7af40acc2 100644\n--- a/tests/device-introspect-test.c\n+++ b/tests/device-introspect-test.c\n@@ -126,7 +126,7 @@ static void test_device_intro_list(void)\n QList *types;\n char *help;\n\n- global_qtest = qtest_init(\"%s\", common_args);\n+ global_qtest = qtest_start(\"%s\", common_args);\n\n types = device_type_list(true);\n QDECREF(types);\n@@ -167,7 +167,7 @@ static void test_qom_list_fields(void)\n QList *non_abstract;\n QListEntry *e;\n\n- global_qtest = qtest_init(\"%s\", common_args);\n+ global_qtest = qtest_start(\"%s\", common_args);\n\n all_types = qom_list_types(NULL, true);\n non_abstract = qom_list_types(NULL, false);\n@@ -194,14 +194,14 @@ static void test_qom_list_fields(void)\n\n static void test_device_intro_none(void)\n {\n- global_qtest = qtest_init(\"%s\", common_args);\n+ global_qtest = qtest_start(\"%s\", common_args);\n test_one_device(\"nonexistent\");\n qtest_quit(global_qtest);\n }\n\n static void test_device_intro_abstract(void)\n {\n- global_qtest = qtest_init(\"%s\", common_args);\n+ global_qtest = qtest_start(\"%s\", common_args);\n test_one_device(\"device\");\n qtest_quit(global_qtest);\n }\n@@ -212,7 +212,7 @@ static void test_device_intro_concrete(void)\n QListEntry *entry;\n const char *type;\n\n- global_qtest = qtest_init(\"%s\", common_args);\n+ global_qtest = qtest_start(\"%s\", common_args);\n types = device_type_list(false);\n\n QLIST_FOREACH_ENTRY(types, entry) {\n@@ -232,7 +232,7 @@ static void test_abstract_interfaces(void)\n QListEntry *e;\n QDict *index;\n\n- global_qtest = qtest_init(\"%s\", common_args);\n+ global_qtest = qtest_start(\"%s\", common_args);\n\n all_types = qom_list_types(\"interface\", true);\n index = qom_type_index(all_types);\ndiff --git a/tests/display-vga-test.c b/tests/display-vga-test.c\nindex 51c6feaaf1..d638f15ec3 100644\n--- a/tests/display-vga-test.c\n+++ b/tests/display-vga-test.c\n@@ -12,33 +12,33 @@\n\n static void pci_cirrus(void)\n {\n- qtest_quit(qtest_init(\"-vga none -device cirrus-vga\"));\n+ qtest_quit(qtest_start(\"-vga none -device cirrus-vga\"));\n }\n\n static void pci_stdvga(void)\n {\n- qtest_quit(qtest_init(\"-vga none -device VGA\"));\n+ qtest_quit(qtest_start(\"-vga none -device VGA\"));\n }\n\n static void pci_secondary(void)\n {\n- qtest_quit(qtest_init(\"-vga none -device secondary-vga\"));\n+ qtest_quit(qtest_start(\"-vga none -device secondary-vga\"));\n }\n\n static void pci_multihead(void)\n {\n- qtest_quit(qtest_init(\"-vga none -device VGA -device secondary-vga\"));\n+ qtest_quit(qtest_start(\"-vga none -device VGA -device secondary-vga\"));\n }\n\n static void pci_virtio_gpu(void)\n {\n- qtest_quit(qtest_init(\"-vga none -device virtio-gpu-pci\"));\n+ qtest_quit(qtest_start(\"-vga none -device virtio-gpu-pci\"));\n }\n\n #ifdef CONFIG_VIRTIO_VGA\n static void pci_virtio_vga(void)\n {\n- qtest_quit(qtest_init(\"-vga none -device virtio-vga\"));\n+ qtest_quit(qtest_start(\"-vga none -device virtio-vga\"));\n }\n #endif\n\ndiff --git a/tests/drive_del-test.c b/tests/drive_del-test.c\nindex 602ab062b4..f68c4bc176 100644\n--- a/tests/drive_del-test.c\n+++ b/tests/drive_del-test.c\n@@ -45,7 +45,7 @@ static void device_del(void)\n static void test_drive_without_dev(void)\n {\n /* Start with an empty drive */\n- global_qtest = qtest_init(\"-drive if=none,id=drive0\");\n+ global_qtest = qtest_start(\"-drive if=none,id=drive0\");\n\n /* Delete the drive */\n drive_del();\n@@ -63,7 +63,7 @@ static void test_after_failed_device_add(void)\n QDict *response;\n QDict *error;\n\n- global_qtest = qtest_init(\"-drive if=none,id=drive0\");\n+ global_qtest = qtest_start(\"-drive if=none,id=drive0\");\n\n /* Make device_add fail. If this leaks the virtio-blk-pci device then a\n * reference to drive0 will also be held (via qdev properties).\n@@ -92,7 +92,7 @@ static void test_after_failed_device_add(void)\n static void test_drive_del_device_del(void)\n {\n /* Start with a drive used by a device that unplugs instantaneously */\n- global_qtest = qtest_init(\n+ global_qtest = qtest_start(\n \"-drive if=none,id=drive0,file=null-co://,format=raw\"\n \" -device virtio-scsi-pci\"\n \" -device scsi-hd,drive=drive0,id=dev0\");\ndiff --git a/tests/ds1338-test.c b/tests/ds1338-test.c\nindex da5b852351..ad5f5b138a 100644\n--- a/tests/ds1338-test.c\n+++ b/tests/ds1338-test.c\n@@ -60,7 +60,7 @@ int main(int argc, char **argv)\n\n g_test_init(&argc, &argv, NULL);\n\n- s = global_qtest = qtest_init(\"-display none -machine imx25-pdk\");\n+ s = global_qtest = qtest_start(\"-display none -machine imx25-pdk\");\n i2c = imx_i2c_create(IMX25_I2C_0_BASE);\n addr = DS1338_ADDR;\n\ndiff --git a/tests/e1000-test.c b/tests/e1000-test.c\nindex 59bd8b781f..1ee33fdd52 100644\n--- a/tests/e1000-test.c\n+++ b/tests/e1000-test.c\n@@ -16,7 +16,7 @@ static void test_device(gconstpointer data)\n const char *model = data;\n QTestState *s;\n\n- s = qtest_init(\"-device %s\", model);\n+ s = qtest_start(\"-device %s\", model);\n qtest_quit(s);\n }\n\ndiff --git a/tests/e1000e-test.c b/tests/e1000e-test.c\nindex 6ef240dc8f..0f6214b70a 100644\n--- a/tests/e1000e-test.c\n+++ b/tests/e1000e-test.c\n@@ -383,8 +383,8 @@ static void data_test_init(e1000e_device *d)\n int ret = socketpair(PF_UNIX, SOCK_STREAM, 0, test_sockets);\n g_assert_cmpint(ret, != , -1);\n\n- global_qtest = qtest_init(\"-netdev socket,fd=%d,id=hs0 \"\n- \"-device e1000e,netdev=hs0\", test_sockets[1]);\n+ global_qtest = qtest_start(\"-netdev socket,fd=%d,id=hs0 \"\n+ \"-device e1000e,netdev=hs0\", test_sockets[1]);\n\n test_alloc = pc_alloc_init(global_qtest);\n g_assert_nonnull(test_alloc);\n@@ -452,7 +452,7 @@ static void test_e1000e_hotplug(gconstpointer data)\n {\n static const uint8_t slot = 0x06;\n\n- global_qtest = qtest_init(\"-device e1000e\");\n+ global_qtest = qtest_start(\"-device e1000e\");\n\n qpci_plug_device_test(\"e1000e\", \"e1000e_net\", slot, NULL);\n qpci_unplug_acpi_device_test(\"e1000e_net\", slot);\ndiff --git a/tests/eepro100-test.c b/tests/eepro100-test.c\nindex 6f49ac2656..be31f5d40d 100644\n--- a/tests/eepro100-test.c\n+++ b/tests/eepro100-test.c\n@@ -16,7 +16,7 @@ static void test_device(gconstpointer data)\n QTestState *s;\n\n /* Tests only initialization so far. TODO: Implement functional tests */\n- s = qtest_init(\"-device %s\", model);\n+ s = qtest_start(\"-device %s\", model);\n qtest_quit(s);\n }\n\ndiff --git a/tests/endianness-test.c b/tests/endianness-test.c\nindex 68d5dbcd14..2c0f2df366 100644\n--- a/tests/endianness-test.c\n+++ b/tests/endianness-test.c\n@@ -115,10 +115,10 @@ static void test_endianness(gconstpointer data)\n {\n const TestCase *test = data;\n\n- global_qtest = qtest_init(\"-M %s%s%s -device pc-testdev\",\n- test->machine,\n- test->superio ? \" -device \" : \"\",\n- test->superio ?: \"\");\n+ global_qtest = qtest_start(\"-M %s%s%s -device pc-testdev\",\n+ test->machine,\n+ test->superio ? \" -device \" : \"\",\n+ test->superio ?: \"\");\n isa_outl(test, 0xe0, 0x87654321);\n g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x87654321);\n g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8765);\n@@ -187,10 +187,10 @@ static void test_endianness_split(gconstpointer data)\n {\n const TestCase *test = data;\n\n- global_qtest = qtest_init(\"-M %s%s%s -device pc-testdev\",\n- test->machine,\n- test->superio ? \" -device \" : \"\",\n- test->superio ?: \"\");\n+ global_qtest = qtest_start(\"-M %s%s%s -device pc-testdev\",\n+ test->machine,\n+ test->superio ? \" -device \" : \"\",\n+ test->superio ?: \"\");\n isa_outl(test, 0xe8, 0x87654321);\n g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x87654321);\n g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8765);\n@@ -231,10 +231,10 @@ static void test_endianness_combine(gconstpointer data)\n {\n const TestCase *test = data;\n\n- global_qtest = qtest_init(\"-M %s%s%s -device pc-testdev\",\n- test->machine,\n- test->superio ? \" -device \" : \"\",\n- test->superio ?: \"\");\n+ global_qtest = qtest_start(\"-M %s%s%s -device pc-testdev\",\n+ test->machine,\n+ test->superio ? \" -device \" : \"\",\n+ test->superio ?: \"\");\n isa_outl(test, 0xe0, 0x87654321);\n g_assert_cmphex(isa_inl(test, 0xe8), ==, 0x87654321);\n g_assert_cmphex(isa_inw(test, 0xea), ==, 0x8765);\ndiff --git a/tests/es1370-test.c b/tests/es1370-test.c\nindex edeea13ae7..ff6fdbfe57 100644\n--- a/tests/es1370-test.c\n+++ b/tests/es1370-test.c\n@@ -22,7 +22,7 @@ int main(int argc, char **argv)\n g_test_init(&argc, &argv, NULL);\n qtest_add_func(\"/es1370/nop\", nop);\n\n- global_qtest = qtest_init(\"-device ES1370\");\n+ global_qtest = qtest_start(\"-device ES1370\");\n ret = g_test_run();\n\n qtest_quit(global_qtest);\ndiff --git a/tests/fdc-test.c b/tests/fdc-test.c\nindex 893097f5a3..ec83625db2 100644\n--- a/tests/fdc-test.c\n+++ b/tests/fdc-test.c\n@@ -564,7 +564,7 @@ int main(int argc, char **argv)\n /* Run the tests */\n g_test_init(&argc, &argv, NULL);\n\n- global_qtest = qtest_init(\"-device floppy,id=floppy0\");\n+ global_qtest = qtest_start(\"-device floppy,id=floppy0\");\n qtest_irq_intercept_in(global_qtest, \"ioapic\");\n qtest_add_func(\"/fdc/cmos\", test_cmos);\n qtest_add_func(\"/fdc/no_media_on_start\", test_no_media_on_start);\ndiff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c\nindex 3a8dc7a2cd..37214fdf10 100644\n--- a/tests/fw_cfg-test.c\n+++ b/tests/fw_cfg-test.c\n@@ -106,7 +106,7 @@ int main(int argc, char **argv)\n\n g_test_init(&argc, &argv, NULL);\n\n- s = qtest_init(\"-uuid 4600cb32-38ec-4b2f-8acb-81c6ea54f2d8\");\n+ s = qtest_start(\"-uuid 4600cb32-38ec-4b2f-8acb-81c6ea54f2d8\");\n\n fw_cfg = pc_fw_cfg_init(s);\n\ndiff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c\nindex e0b19cdf17..73d23b14b8 100644\n--- a/tests/hd-geo-test.c\n+++ b/tests/hd-geo-test.c\n@@ -241,7 +241,7 @@ static void test_ide_none(void)\n\n setup_common(argv, ARGV_SIZE);\n args = g_strjoinv(\" \", argv);\n- global_qtest = qtest_init(\"%s\", args);\n+ global_qtest = qtest_start(\"%s\", args);\n g_strfreev(argv);\n g_free(args);\n test_cmos();\n@@ -263,7 +263,7 @@ static void test_ide_mbr(bool use_device, MBRcontents mbr)\n argc = setup_ide(argc, argv, ARGV_SIZE, i, dev, i, mbr, \"\");\n }\n args = g_strjoinv(\" \", argv);\n- global_qtest = qtest_init(\"%s\", args);\n+ global_qtest = qtest_start(\"%s\", args);\n g_strfreev(argv);\n g_free(args);\n test_cmos();\n@@ -339,7 +339,7 @@ static void test_ide_drive_user(const char *dev, bool trans)\n dev ? \"\" : opts);\n g_free(opts);\n args = g_strjoinv(\" \", argv);\n- global_qtest = qtest_init(\"%s\", args);\n+ global_qtest = qtest_start(\"%s\", args);\n g_strfreev(argv);\n g_free(args);\n test_cmos();\n@@ -396,7 +396,7 @@ static void test_ide_drive_cd_0(void)\n ide_idx, NULL, i, mbr_blank, \"\");\n }\n args = g_strjoinv(\" \", argv);\n- global_qtest = qtest_init(\"%s\", args);\n+ global_qtest = qtest_start(\"%s\", args);\n g_strfreev(argv);\n g_free(args);\n test_cmos();\ndiff --git a/tests/i440fx-test.c b/tests/i440fx-test.c\nindex bfedd5d953..ac98101e6f 100644\n--- a/tests/i440fx-test.c\n+++ b/tests/i440fx-test.c\n@@ -33,7 +33,7 @@ typedef struct FirmwareTestFixture {\n\n static QPCIBus *test_start_get_bus(const TestData *s)\n {\n- global_qtest = qtest_init(\"-smp %d\", s->num_cpus);\n+ global_qtest = qtest_start(\"-smp %d\", s->num_cpus);\n return qpci_init_pc(global_qtest, NULL);\n }\n\n@@ -340,10 +340,10 @@ static void test_i440fx_firmware(FirmwareTestFixture *fixture,\n : \"-drive if=pflash,format=raw,file=\",\n fw_pathname);\n g_test_message(\"qemu cmdline: %s\", cmdline);\n- global_qtest = qtest_init(\"%s\", cmdline);\n+ global_qtest = qtest_start(\"%s\", cmdline);\n g_free(cmdline);\n\n- /* QEMU has loaded the firmware (because qtest_init() only returns after\n+ /* QEMU has loaded the firmware (because qtest_start() only returns after\n * the QMP handshake completes). We must unlink the firmware blob right\n * here, because any assertion firing below would leak it in the\n * filesystem. This is also the reason why we recreate the blob every time\ndiff --git a/tests/i82801b11-test.c b/tests/i82801b11-test.c\nindex 58436172b7..b76714ae16 100644\n--- a/tests/i82801b11-test.c\n+++ b/tests/i82801b11-test.c\n@@ -22,8 +22,8 @@ int main(int argc, char **argv)\n g_test_init(&argc, &argv, NULL);\n qtest_add_func(\"/i82801b11/nop\", nop);\n\n- global_qtest = qtest_init(\"-machine q35 \"\n- \"-device i82801b11-bridge,bus=pcie.0,addr=1e.0\");\n+ global_qtest = qtest_start(\"-machine q35 \"\n+ \"-device i82801b11-bridge,bus=pcie.0,addr=1e.0\");\n ret = g_test_run();\n\n qtest_quit(global_qtest);\ndiff --git a/tests/ide-test.c b/tests/ide-test.c\nindex b22a4fc1c5..7b7cc10176 100644\n--- a/tests/ide-test.c\n+++ b/tests/ide-test.c\n@@ -124,7 +124,7 @@ static void ide_test_start(const char *cmdline_fmt, ...)\n cmdline = g_strdup_vprintf(cmdline_fmt, ap);\n va_end(ap);\n\n- global_qtest = qtest_init(\"%s\", cmdline);\n+ global_qtest = qtest_start(\"%s\", cmdline);\n guest_malloc = pc_alloc_init(global_qtest);\n\n g_free(cmdline);\ndiff --git a/tests/intel-hda-test.c b/tests/intel-hda-test.c\nindex c10a59d932..86f7719d39 100644\n--- a/tests/intel-hda-test.c\n+++ b/tests/intel-hda-test.c\n@@ -18,13 +18,13 @@\n /* Tests only initialization so far. TODO: Replace with functional tests */\n static void ich6_test(void)\n {\n- global_qtest = qtest_init(\"-device intel-hda,id=\" HDA_ID CODEC_DEVICES);\n+ global_qtest = qtest_start(\"-device intel-hda,id=\" HDA_ID CODEC_DEVICES);\n qtest_quit(global_qtest);\n }\n\n static void ich9_test(void)\n {\n- global_qtest = qtest_init(\n+ global_qtest = qtest_start(\n \"-machine q35 -device ich9-intel-hda,bus=pcie.0,addr=1b.0,id=\"\n HDA_ID CODEC_DEVICES);\n qtest_quit(global_qtest);\ndiff --git a/tests/ioh3420-test.c b/tests/ioh3420-test.c\nindex cd5d062370..aff569b99e 100644\n--- a/tests/ioh3420-test.c\n+++ b/tests/ioh3420-test.c\n@@ -22,7 +22,7 @@ int main(int argc, char **argv)\n g_test_init(&argc, &argv, NULL);\n qtest_add_func(\"/ioh3420/nop\", nop);\n\n- global_qtest = qtest_init(\n+ global_qtest = qtest_start(\n \"-machine q35 -device ioh3420,bus=pcie.0,addr=1c.0,port=1,\"\n \"chassis=1,multifunction=on\");\n ret = g_test_run();\ndiff --git a/tests/ipmi-bt-test.c b/tests/ipmi-bt-test.c\nindex 476d527cfd..fdcbadb755 100644\n--- a/tests/ipmi-bt-test.c\n+++ b/tests/ipmi-bt-test.c\n@@ -414,7 +414,7 @@ int main(int argc, char **argv)\n /* Run the tests */\n g_test_init(&argc, &argv, NULL);\n\n- global_qtest = qtest_init(\n+ global_qtest = qtest_start(\n \" -chardev socket,id=ipmi0,host=localhost,port=%d,reconnect=10\"\n \" -device ipmi-bmc-extern,chardev=ipmi0,id=bmc0\"\n \" -device isa-ipmi-bt,bmc=bmc0\", emu_port);\ndiff --git a/tests/ipmi-kcs-test.c b/tests/ipmi-kcs-test.c\nindex 2bd3771e9f..5acc0d9e35 100644\n--- a/tests/ipmi-kcs-test.c\n+++ b/tests/ipmi-kcs-test.c\n@@ -275,8 +275,8 @@ int main(int argc, char **argv)\n /* Run the tests */\n g_test_init(&argc, &argv, NULL);\n\n- global_qtest = qtest_init(\"-device ipmi-bmc-sim,id=bmc0\"\n- \" -device isa-ipmi-kcs,bmc=bmc0\");\n+ global_qtest = qtest_start(\"-device ipmi-bmc-sim,id=bmc0\"\n+ \" -device isa-ipmi-kcs,bmc=bmc0\");\n qtest_irq_intercept_in(global_qtest, \"ioapic\");\n qtest_add_func(\"/ipmi/local/kcs_base\", test_kcs_base);\n qtest_add_func(\"/ipmi/local/kcs_abort\", test_kcs_abort);\ndiff --git a/tests/ipoctal232-test.c b/tests/ipoctal232-test.c\nindex 5e1cae3917..90b683284a 100644\n--- a/tests/ipoctal232-test.c\n+++ b/tests/ipoctal232-test.c\n@@ -22,8 +22,8 @@ int main(int argc, char **argv)\n g_test_init(&argc, &argv, NULL);\n qtest_add_func(\"/ipoctal232/tpci200/nop\", nop);\n\n- global_qtest = qtest_init(\"-device tpci200,id=ipack0 \"\n- \"-device ipoctal232,bus=ipack0.0\");\n+ global_qtest = qtest_start(\"-device tpci200,id=ipack0 \"\n+ \"-device ipoctal232,bus=ipack0.0\");\n ret = g_test_run();\n\n qtest_quit(global_qtest);\ndiff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c\nindex f254f09487..6ad3e5f834 100644\n--- a/tests/ivshmem-test.c\n+++ b/tests/ivshmem-test.c\n@@ -407,7 +407,7 @@ static void test_ivshmem_hotplug(void)\n const char *arch = qtest_get_arch();\n gchar *opts;\n\n- global_qtest = qtest_init(\" \");\n+ global_qtest = qtest_start(\" \");\n\n opts = g_strdup_printf(\"'shm': '%s', 'size': '1M'\", tmpshm);\n\ndiff --git a/tests/libqos/libqos.c b/tests/libqos/libqos.c\nindex bd9106a132..1dea434e37 100644\n--- a/tests/libqos/libqos.c\n+++ b/tests/libqos/libqos.c\n@@ -20,7 +20,7 @@ QOSState *qtest_vboot(QOSOps *ops, const char *cmdline_fmt, va_list ap)\n struct QOSState *qs = g_malloc(sizeof(QOSState));\n\n cmdline = g_strdup_vprintf(cmdline_fmt, ap);\n- qs->qts = global_qtest = qtest_init(\"%s\", cmdline);\n+ qs->qts = global_qtest = qtest_start(\"%s\", cmdline);\n qs->ops = ops;\n if (ops) {\n if (ops->init_allocator) {\ndiff --git a/tests/m25p80-test.c b/tests/m25p80-test.c\nindex 18135cfb86..82d9bb9ff0 100644\n--- a/tests/m25p80-test.c\n+++ b/tests/m25p80-test.c\n@@ -363,9 +363,9 @@ int main(int argc, char **argv)\n g_assert(ret == 0);\n close(fd);\n\n- global_qtest = qtest_init(\"-m 256 -machine palmetto-bmc \"\n- \"-drive file=%s,format=raw,if=mtd\",\n- tmp_path);\n+ global_qtest = qtest_start(\"-m 256 -machine palmetto-bmc \"\n+ \"-drive file=%s,format=raw,if=mtd\",\n+ tmp_path);\n\n qtest_add_func(\"/m25p80/read_jedec\", test_read_jedec);\n qtest_add_func(\"/m25p80/erase_sector\", test_erase_sector);\ndiff --git a/tests/m48t59-test.c b/tests/m48t59-test.c\nindex 52c61fe33e..aadd770f4f 100644\n--- a/tests/m48t59-test.c\n+++ b/tests/m48t59-test.c\n@@ -246,7 +246,7 @@ int main(int argc, char **argv)\n\n g_test_init(&argc, &argv, NULL);\n\n- s = global_qtest = qtest_init(\"-rtc clock=vm\");\n+ s = global_qtest = qtest_start(\"-rtc clock=vm\");\n\n qtest_add_func(\"/rtc/bcd/check-time\", bcd_check_time);\n qtest_add_func(\"/rtc/fuzz-registers\", fuzz_registers);\ndiff --git a/tests/ne2000-test.c b/tests/ne2000-test.c\nindex d205bc91a6..8e6f7b07c6 100644\n--- a/tests/ne2000-test.c\n+++ b/tests/ne2000-test.c\n@@ -22,7 +22,7 @@ int main(int argc, char **argv)\n g_test_init(&argc, &argv, NULL);\n qtest_add_func(\"/ne2000/pci/nop\", pci_nop);\n\n- global_qtest = qtest_init(\"-device ne2k_pci\");\n+ global_qtest = qtest_start(\"-device ne2k_pci\");\n ret = g_test_run();\n\n qtest_quit(global_qtest);\ndiff --git a/tests/numa-test.c b/tests/numa-test.c\nindex 17bbc0f5f8..5653eaac47 100644\n--- a/tests/numa-test.c\n+++ b/tests/numa-test.c\n@@ -25,7 +25,7 @@ static void test_mon_explicit(const void *data)\n cli = make_cli(data, \"-smp 8 \"\n \"-numa node,nodeid=0,cpus=0-3 \"\n \"-numa node,nodeid=1,cpus=4-7 \");\n- global_qtest = qtest_init(\"%s\", cli);\n+ global_qtest = qtest_start(\"%s\", cli);\n\n s = hmp(\"info numa\");\n g_assert(strstr(s, \"node 0 cpus: 0 1 2 3\"));\n@@ -42,7 +42,7 @@ static void test_mon_default(const void *data)\n char *cli;\n\n cli = make_cli(data, \"-smp 8 -numa node -numa node\");\n- global_qtest = qtest_init(\"%s\", cli);\n+ global_qtest = qtest_start(\"%s\", cli);\n\n s = hmp(\"info numa\");\n g_assert(strstr(s, \"node 0 cpus: 0 2 4 6\"));\n@@ -61,7 +61,7 @@ static void test_mon_partial(const void *data)\n cli = make_cli(data, \"-smp 8 \"\n \"-numa node,nodeid=0,cpus=0-1 \"\n \"-numa node,nodeid=1,cpus=4-5 \");\n- global_qtest = qtest_init(\"%s\", cli);\n+ global_qtest = qtest_start(\"%s\", cli);\n\n s = hmp(\"info numa\");\n g_assert(strstr(s, \"node 0 cpus: 0 1 2 3 6 7\"));\n@@ -88,7 +88,7 @@ static void test_query_cpus(const void *data)\n QObject *e;\n\n cli = make_cli(data, \"-smp 8 -numa node,cpus=0-3 -numa node,cpus=4-7\");\n- global_qtest = qtest_init(\"%s\", cli);\n+ global_qtest = qtest_start(\"%s\", cli);\n cpus = get_cpus(&resp);\n g_assert(cpus);\n\n@@ -130,7 +130,7 @@ static void pc_numa_cpu(const void *data)\n \"-numa cpu,node-id=0,socket-id=1,core-id=0 \"\n \"-numa cpu,node-id=0,socket-id=1,core-id=1,thread-id=0 \"\n \"-numa cpu,node-id=1,socket-id=1,core-id=1,thread-id=1\");\n- global_qtest = qtest_init(\"%s\", cli);\n+ global_qtest = qtest_start(\"%s\", cli);\n cpus = get_cpus(&resp);\n g_assert(cpus);\n\n@@ -183,7 +183,7 @@ static void spapr_numa_cpu(const void *data)\n \"-numa cpu,node-id=0,core-id=1 \"\n \"-numa cpu,node-id=0,core-id=2 \"\n \"-numa cpu,node-id=1,core-id=3\");\n- global_qtest = qtest_init(\"%s\", cli);\n+ global_qtest = qtest_start(\"%s\", cli);\n cpus = get_cpus(&resp);\n g_assert(cpus);\n\n@@ -226,7 +226,7 @@ static void aarch64_numa_cpu(const void *data)\n \"-numa node,nodeid=0 -numa node,nodeid=1 \"\n \"-numa cpu,node-id=1,thread-id=0 \"\n \"-numa cpu,node-id=0,thread-id=1\");\n- global_qtest = qtest_init(\"%s\", cli);\n+ global_qtest = qtest_start(\"%s\", cli);\n cpus = get_cpus(&resp);\n g_assert(cpus);\n\ndiff --git a/tests/nvme-test.c b/tests/nvme-test.c\nindex 382d26671f..b054ad6fcd 100644\n--- a/tests/nvme-test.c\n+++ b/tests/nvme-test.c\n@@ -22,7 +22,7 @@ int main(int argc, char **argv)\n g_test_init(&argc, &argv, NULL);\n qtest_add_func(\"/nvme/nop\", nop);\n\n- global_qtest = qtest_init(\n+ global_qtest = qtest_start(\n \"-drive id=drv0,if=none,file=null-co://,format=raw \"\n \"-device nvme,drive=drv0,serial=foo\");\n ret = g_test_run();\ndiff --git a/tests/pc-cpu-test.c b/tests/pc-cpu-test.c\nindex 9c36051c07..1243bc64b8 100644\n--- a/tests/pc-cpu-test.c\n+++ b/tests/pc-cpu-test.c\n@@ -29,10 +29,10 @@ static void test_pc_with_cpu_add(gconstpointer data)\n QDict *response;\n unsigned int i;\n\n- global_qtest = qtest_init(\"-machine %s -cpu %s \"\n- \"-smp sockets=%u,cores=%u,threads=%u,maxcpus=%u\",\n- s->machine, s->cpu_model,\n- s->sockets, s->cores, s->threads, s->maxcpus);\n+ global_qtest = qtest_start(\"-machine %s -cpu %s \"\n+ \"-smp sockets=%u,cores=%u,threads=%u,maxcpus=%u\",\n+ s->machine, s->cpu_model,\n+ s->sockets, s->cores, s->threads, s->maxcpus);\n\n for (i = s->sockets * s->cores * s->threads; i < s->maxcpus; i++) {\n response = qmp(\"{ 'execute': 'cpu-add',\"\n@@ -50,10 +50,10 @@ static void test_pc_without_cpu_add(gconstpointer data)\n const PCTestData *s = data;\n QDict *response;\n\n- global_qtest = qtest_init(\"-machine %s -cpu %s \"\n- \"-smp sockets=%u,cores=%u,threads=%u,maxcpus=%u\",\n- s->machine, s->cpu_model,\n- s->sockets, s->cores, s->threads, s->maxcpus);\n+ global_qtest = qtest_start(\"-machine %s -cpu %s \"\n+ \"-smp sockets=%u,cores=%u,threads=%u,maxcpus=%u\",\n+ s->machine, s->cpu_model,\n+ s->sockets, s->cores, s->threads, s->maxcpus);\n\n response = qmp(\"{ 'execute': 'cpu-add',\"\n \" 'arguments': { 'id': %d } }\",\ndiff --git a/tests/pcnet-test.c b/tests/pcnet-test.c\nindex 23e36da805..a58a5fd7bf 100644\n--- a/tests/pcnet-test.c\n+++ b/tests/pcnet-test.c\n@@ -22,7 +22,7 @@ int main(int argc, char **argv)\n g_test_init(&argc, &argv, NULL);\n qtest_add_func(\"/pcnet/pci/nop\", pci_nop);\n\n- global_qtest = qtest_init(\"-device pcnet\");\n+ global_qtest = qtest_start(\"-device pcnet\");\n ret = g_test_run();\n\n qtest_quit(global_qtest);\ndiff --git a/tests/pnv-xscom-test.c b/tests/pnv-xscom-test.c\nindex 852322b3f2..ee25bf7dae 100644\n--- a/tests/pnv-xscom-test.c\n+++ b/tests/pnv-xscom-test.c\n@@ -83,7 +83,7 @@ static void test_cfam_id(const void *data)\n {\n const PnvChip *chip = data;\n\n- global_qtest = qtest_init(\"-M powernv,accel=tcg -cpu %s\", chip->cpu_model);\n+ global_qtest = qtest_start(\"-M powernv,accel=tcg -cpu %s\", chip->cpu_model);\n test_xscom_cfam_id(chip);\n qtest_quit(global_qtest);\n }\n@@ -106,7 +106,7 @@ static void test_core(const void *data)\n {\n const PnvChip *chip = data;\n\n- global_qtest = qtest_init(\"-M powernv,accel=tcg -cpu %s\", chip->cpu_model);\n+ global_qtest = qtest_start(\"-M powernv,accel=tcg -cpu %s\", chip->cpu_model);\n test_xscom_core(chip);\n qtest_quit(global_qtest);\n }\ndiff --git a/tests/postcopy-test.c b/tests/postcopy-test.c\nindex 20cfb280f6..4cd75400af 100644\n--- a/tests/postcopy-test.c\n+++ b/tests/postcopy-test.c\n@@ -403,10 +403,10 @@ static void test_migrate(void)\n\n g_free(bootpath);\n\n- from = qtest_init(\"%s\", cmd_src);\n+ from = qtest_start(\"%s\", cmd_src);\n g_free(cmd_src);\n\n- to = qtest_init(\"%s\", cmd_dst);\n+ to = qtest_start(\"%s\", cmd_dst);\n g_free(cmd_dst);\n\n assert(!global_qtest);\ndiff --git a/tests/prom-env-test.c b/tests/prom-env-test.c\nindex fffef0b252..501075724a 100644\n--- a/tests/prom-env-test.c\n+++ b/tests/prom-env-test.c\n@@ -49,11 +49,11 @@ static void test_machine(const void *machine)\n /* The pseries firmware boots much faster without the default devices */\n extra_args = strcmp(machine, \"pseries\") == 0 ? \"-nodefaults\" : \"\";\n\n- global_qtest = qtest_init(\"-M %s,accel=tcg %s \"\n- \"-prom-env 'use-nvramrc?=true' \"\n- \"-prom-env 'nvramrc=%x %x l!' \",\n- (const char *)machine, extra_args,\n- MAGIC, ADDRESS);\n+ global_qtest = qtest_start(\"-M %s,accel=tcg %s \"\n+ \"-prom-env 'use-nvramrc?=true' \"\n+ \"-prom-env 'nvramrc=%x %x l!' \",\n+ (const char *)machine, extra_args,\n+ MAGIC, ADDRESS);\n check_guest_memory();\n qtest_quit(global_qtest);\n }\ndiff --git a/tests/pvpanic-test.c b/tests/pvpanic-test.c\nindex 48b71be26f..c09b3ddac6 100644\n--- a/tests/pvpanic-test.c\n+++ b/tests/pvpanic-test.c\n@@ -37,7 +37,7 @@ int main(int argc, char **argv)\n g_test_init(&argc, &argv, NULL);\n qtest_add_func(\"/pvpanic/panic\", test_panic);\n\n- global_qtest = qtest_init(\"-device pvpanic\");\n+ global_qtest = qtest_start(\"-device pvpanic\");\n ret = g_test_run();\n\n qtest_quit(global_qtest);\ndiff --git a/tests/pxe-test.c b/tests/pxe-test.c\nindex eaad88601a..4bcf8ce124 100644\n--- a/tests/pxe-test.c\n+++ b/tests/pxe-test.c\n@@ -23,11 +23,11 @@ static char disk[] = \"tests/pxe-test-disk-XXXXXX\";\n\n static void test_pxe_one(const char *params, bool ipv6)\n {\n- global_qtest = qtest_init(\"-machine accel=kvm:tcg -nodefaults \"\n- \"-boot order=n \"\n- \"-netdev user,id=\" NETNAME \",tftp=./,bootfile=%s,\"\n- \"ipv4=%s,ipv6=%s %s\", disk, ipv6 ? \"off\" : \"on\",\n- ipv6 ? \"on\" : \"off\", params);\n+ global_qtest = qtest_start(\n+ \"-machine accel=kvm:tcg -nodefaults -boot order=n \"\n+ \"-netdev user,id=\" NETNAME \",tftp=./,bootfile=%s,\"\n+ \"ipv4=%s,ipv6=%s %s\", disk, ipv6 ? \"off\" : \"on\",\n+ ipv6 ? \"on\" : \"off\", params);\n boot_sector_test(global_qtest);\n qtest_quit(global_qtest);\n }\ndiff --git a/tests/q35-test.c b/tests/q35-test.c\nindex 91a189ce62..21c0fd9bab 100644\n--- a/tests/q35-test.c\n+++ b/tests/q35-test.c\n@@ -84,7 +84,7 @@ static void test_smram_lock(void)\n QPCIDevice *pcidev;\n QDict *response;\n\n- global_qtest = qtest_init(\"-M q35\");\n+ global_qtest = qtest_start(\"-M q35\");\n\n pcibus = qpci_init_pc(global_qtest, NULL);\n g_assert(pcibus != NULL);\n@@ -141,7 +141,7 @@ static void test_tseg_size(const void *data)\n cmdline = g_strdup_printf(\"-M q35 -m %uM\",\n TSEG_SIZE_TEST_GUEST_RAM_MBYTES);\n }\n- global_qtest = qtest_init(\"%s\", cmdline);\n+ global_qtest = qtest_start(\"%s\", cmdline);\n g_free(cmdline);\n\n /* locate the DRAM controller */\ndiff --git a/tests/qmp-test.c b/tests/qmp-test.c\nindex cf523b325e..14f4f57600 100644\n--- a/tests/qmp-test.c\n+++ b/tests/qmp-test.c\n@@ -76,7 +76,7 @@ static void test_qmp_protocol(void)\n QList *capabilities;\n QTestState *qts;\n\n- qts = qtest_init_without_qmp_handshake(common_args);\n+ qts = qtest_start_without_qmp_handshake(common_args);\n\n /* Test greeting */\n resp = qtest_qmp_receive(qts);\ndiff --git a/tests/qom-test.c b/tests/qom-test.c\nindex 5edd735387..9aecf40f96 100644\n--- a/tests/qom-test.c\n+++ b/tests/qom-test.c\n@@ -92,7 +92,7 @@ static void test_machine(gconstpointer data)\n const char *machine = data;\n QDict *response;\n\n- global_qtest = qtest_init(\"-machine %s\", machine);\n+ global_qtest = qtest_start(\"-machine %s\", machine);\n\n test_properties(\"/machine\", true);\n\ndiff --git a/tests/rtc-test.c b/tests/rtc-test.c\nindex b6058d28f5..dd5430dd2d 100644\n--- a/tests/rtc-test.c\n+++ b/tests/rtc-test.c\n@@ -690,7 +690,7 @@ int main(int argc, char **argv)\n\n g_test_init(&argc, &argv, NULL);\n\n- s = global_qtest = qtest_init(\"-rtc clock=vm\");\n+ s = global_qtest = qtest_start(\"-rtc clock=vm\");\n qtest_irq_intercept_in(s, \"ioapic\");\n\n qtest_add_func(\"/rtc/check-time/bcd\", bcd_check_time);\ndiff --git a/tests/rtl8139-test.c b/tests/rtl8139-test.c\nindex dc9935439f..1741f0ec47 100644\n--- a/tests/rtl8139-test.c\n+++ b/tests/rtl8139-test.c\n@@ -197,7 +197,7 @@ int main(int argc, char **argv)\n {\n int ret;\n\n- global_qtest = qtest_init(\"-device rtl8139\");\n+ global_qtest = qtest_start(\"-device rtl8139\");\n\n g_test_init(&argc, &argv, NULL);\n qtest_add_func(\"/rtl8139/nop\", nop);\ndiff --git a/tests/spapr-phb-test.c b/tests/spapr-phb-test.c\nindex 0d26cbda6c..058ab447d7 100644\n--- a/tests/spapr-phb-test.c\n+++ b/tests/spapr-phb-test.c\n@@ -25,8 +25,8 @@ int main(int argc, char **argv)\n g_test_init(&argc, &argv, NULL);\n qtest_add_func(\"/spapr-phb/device\", test_phb_device);\n\n- global_qtest = qtest_init(\"-device \" TYPE_SPAPR_PCI_HOST_BRIDGE\n- \",index=30\");\n+ global_qtest = qtest_start(\"-device \" TYPE_SPAPR_PCI_HOST_BRIDGE\n+ \",index=30\");\n\n ret = g_test_run();\n\ndiff --git a/tests/tco-test.c b/tests/tco-test.c\nindex b2a4baeeef..9d406dcdc7 100644\n--- a/tests/tco-test.c\n+++ b/tests/tco-test.c\n@@ -56,9 +56,9 @@ static void test_init(TestData *d)\n {\n QTestState *qs;\n\n- qs = qtest_init(\"-machine q35 %s %s\",\n- d->noreboot ? \"\" : \"-global ICH9-LPC.noreboot=false\",\n- !d->args ? \"\" : d->args);\n+ qs = qtest_start(\"-machine q35 %s %s\",\n+ d->noreboot ? \"\" : \"-global ICH9-LPC.noreboot=false\",\n+ !d->args ? \"\" : d->args);\n global_qtest = qs;\n qtest_irq_intercept_in(qs, \"ioapic\");\n\ndiff --git a/tests/test-arm-mptimer.c b/tests/test-arm-mptimer.c\nindex a4bef2322a..9631c55fe3 100644\n--- a/tests/test-arm-mptimer.c\n+++ b/tests/test-arm-mptimer.c\n@@ -1097,7 +1097,7 @@ tests_with_prescaler_arg:\n goto tests_with_prescaler_arg;\n }\n\n- global_qtest = qtest_init(\"-machine vexpress-a9\");\n+ global_qtest = qtest_start(\"-machine vexpress-a9\");\n ret = g_test_run();\n qtest_quit(global_qtest);\n\ndiff --git a/tests/test-filter-mirror.c b/tests/test-filter-mirror.c\nindex 9d8608a609..18f7af5f25 100644\n--- a/tests/test-filter-mirror.c\n+++ b/tests/test-filter-mirror.c\n@@ -36,7 +36,7 @@ static void test_mirror(void)\n ret = mkstemp(sock_path);\n g_assert_cmpint(ret, !=, -1);\n\n- global_qtest = qtest_init(\n+ global_qtest = qtest_start(\n \"-netdev socket,id=qtest-bn0,fd=%d \"\n \"-device %s,netdev=qtest-bn0,id=qtest-e0 \"\n \"-chardev socket,id=mirror0,path=%s,server,nowait \"\ndiff --git a/tests/test-filter-redirector.c b/tests/test-filter-redirector.c\nindex b34f8ec2ad..becf74ef14 100644\n--- a/tests/test-filter-redirector.c\n+++ b/tests/test-filter-redirector.c\n@@ -86,7 +86,7 @@ static void test_redirector_tx(void)\n ret = mkstemp(sock_path1);\n g_assert_cmpint(ret, !=, -1);\n\n- global_qtest = qtest_init(\n+ global_qtest = qtest_start(\n \"-netdev socket,id=qtest-bn0,fd=%d \"\n \"-device %s,netdev=qtest-bn0,id=qtest-e0 \"\n \"-chardev socket,id=redirector0,path=%s,server,nowait \"\n@@ -155,7 +155,7 @@ static void test_redirector_rx(void)\n ret = mkstemp(sock_path1);\n g_assert_cmpint(ret, !=, -1);\n\n- global_qtest = qtest_init(\n+ global_qtest = qtest_start(\n \"-netdev socket,id=qtest-bn0,fd=%d \"\n \"-device %s,netdev=qtest-bn0,id=qtest-e0 \"\n \"-chardev socket,id=redirector0,path=%s,server,nowait \"\ndiff --git a/tests/test-hmp.c b/tests/test-hmp.c\nindex dd03693707..d7d5f13a14 100644\n--- a/tests/test-hmp.c\n+++ b/tests/test-hmp.c\n@@ -120,7 +120,7 @@ static void test_machine(gconstpointer data)\n {\n const char *machine = data;\n\n- global_qtest = qtest_init(\"-S -M %s\", machine);\n+ global_qtest = qtest_start(\"-S -M %s\", machine);\n\n test_info_commands();\n test_commands();\ndiff --git a/tests/test-netfilter.c b/tests/test-netfilter.c\nindex 76caaedfc1..1215d13a62 100644\n--- a/tests/test-netfilter.c\n+++ b/tests/test-netfilter.c\n@@ -196,8 +196,8 @@ int main(int argc, char **argv)\n qtest_add_func(\"/netfilter/remove_netdev_multi\",\n remove_netdev_with_multi_netfilter);\n\n- global_qtest = qtest_init(\"-netdev user,id=qtest-bn0 \"\n- \"-device %s,netdev=qtest-bn0\", devstr);\n+ global_qtest = qtest_start(\"-netdev user,id=qtest-bn0 \"\n+ \"-device %s,netdev=qtest-bn0\", devstr);\n ret = g_test_run();\n\n qtest_quit(global_qtest);\ndiff --git a/tests/test-x86-cpuid-compat.c b/tests/test-x86-cpuid-compat.c\nindex 5b026ac38a..a5c2f10ebb 100644\n--- a/tests/test-x86-cpuid-compat.c\n+++ b/tests/test-x86-cpuid-compat.c\n@@ -59,7 +59,7 @@ static void test_cpuid_prop(const void *data)\n QNum *value;\n int64_t val;\n\n- global_qtest = qtest_init(\"%s\", args->cmdline);\n+ global_qtest = qtest_start(\"%s\", args->cmdline);\n path = get_cpu0_qom_path();\n value = qobject_to_qnum(qom_get(path, args->property));\n g_assert(qnum_get_try_int(value, &val));\n@@ -131,7 +131,7 @@ static void test_feature_flag(const void *data)\n QList *present, *filtered;\n uint32_t value;\n\n- global_qtest = qtest_init(\"%s\", args->cmdline);\n+ global_qtest = qtest_start(\"%s\", args->cmdline);\n path = get_cpu0_qom_path();\n present = qobject_to_qlist(qom_get(path, \"feature-words\"));\n filtered = qobject_to_qlist(qom_get(path, \"filtered-features\"));\n@@ -181,8 +181,8 @@ static void test_plus_minus_subprocess(void)\n * Note: rules 1 and 2 are planned to be removed soon, and\n * should generate a warning.\n */\n- global_qtest = qtest_init(\"-cpu pentium,-fpu,+fpu,-mce,mce=on,+cx8,\"\n- \"cx8=off,+sse4_1,sse4_2=on\");\n+ global_qtest = qtest_start(\"-cpu pentium,-fpu,+fpu,-mce,mce=on,+cx8,\"\n+ \"cx8=off,+sse4_1,sse4_2=on\");\n path = get_cpu0_qom_path();\n\n g_assert_false(qom_get_bool(path, \"fpu\"));\ndiff --git a/tests/tmp105-test.c b/tests/tmp105-test.c\nindex 3ef2efff6e..9233585e4b 100644\n--- a/tests/tmp105-test.c\n+++ b/tests/tmp105-test.c\n@@ -151,9 +151,10 @@ int main(int argc, char **argv)\n\n g_test_init(&argc, &argv, NULL);\n\n- s = global_qtest = qtest_init(\"-machine n800 \"\n- \"-device tmp105,bus=i2c-bus.0,id=\" TMP105_TEST_ID\n- \",address=0x49\");\n+ s = global_qtest = qtest_start(\n+ \"-machine n800 \"\n+ \"-device tmp105,bus=i2c-bus.0,id=\" TMP105_TEST_ID\n+ \",address=0x49\");\n i2c = omap_i2c_create(OMAP2_I2C_1_BASE);\n\n qtest_add_func(\"/tmp105/tx-rx\", send_and_receive);\ndiff --git a/tests/tpci200-test.c b/tests/tpci200-test.c\nindex 2ed378196d..223d44da35 100644\n--- a/tests/tpci200-test.c\n+++ b/tests/tpci200-test.c\n@@ -22,7 +22,7 @@ int main(int argc, char **argv)\n g_test_init(&argc, &argv, NULL);\n qtest_add_func(\"/tpci200/nop\", nop);\n\n- global_qtest = qtest_init(\"-device tpci200\");\n+ global_qtest = qtest_start(\"-device tpci200\");\n ret = g_test_run();\n\n qtest_quit(global_qtest);\ndiff --git a/tests/usb-hcd-ehci-test.c b/tests/usb-hcd-ehci-test.c\nindex 55349a39a2..c3568a1782 100644\n--- a/tests/usb-hcd-ehci-test.c\n+++ b/tests/usb-hcd-ehci-test.c\n@@ -156,7 +156,7 @@ int main(int argc, char **argv)\n qtest_add_func(\"/ehci/pci/ehci-port-2\", pci_ehci_port_2);\n qtest_add_func(\"/ehci/pci/ehci-port-3-hotplug\", pci_ehci_port_hotplug);\n\n- global_qtest = qtest_init(\n+ global_qtest = qtest_start(\n \"-machine q35 -device ich9-usb-ehci1,bus=pcie.0,addr=1d.7,\"\n \"multifunction=on,id=ich9-ehci-1 \"\n \"-device ich9-usb-uhci1,bus=pcie.0,addr=1d.0,\"\ndiff --git a/tests/usb-hcd-ohci-test.c b/tests/usb-hcd-ohci-test.c\nindex 2763c9ec24..62fd35f69a 100644\n--- a/tests/usb-hcd-ohci-test.c\n+++ b/tests/usb-hcd-ohci-test.c\n@@ -31,7 +31,7 @@ int main(int argc, char **argv)\n qtest_add_func(\"/ohci/pci/init\", test_ohci_init);\n qtest_add_func(\"/ohci/pci/hotplug\", test_ohci_hotplug);\n\n- global_qtest = qtest_init(\"-device pci-ohci,id=ohci\");\n+ global_qtest = qtest_start(\"-device pci-ohci,id=ohci\");\n ret = g_test_run();\n qtest_quit(global_qtest);\n\ndiff --git a/tests/usb-hcd-xhci-test.c b/tests/usb-hcd-xhci-test.c\nindex cc3fcd82fa..bd3c65ae85 100644\n--- a/tests/usb-hcd-xhci-test.c\n+++ b/tests/usb-hcd-xhci-test.c\n@@ -80,8 +80,9 @@ int main(int argc, char **argv)\n qtest_add_func(\"/xhci/pci/hotplug\", test_xhci_hotplug);\n qtest_add_func(\"/xhci/pci/hotplug/usb-uas\", test_usb_uas_hotplug);\n\n- global_qtest = qtest_init(\"-device nec-usb-xhci,id=xhci\"\n- \" -drive id=drive0,if=none,file=null-co://,format=raw\");\n+ global_qtest = qtest_start(\n+ \"-device nec-usb-xhci,id=xhci\"\n+ \" -drive id=drive0,if=none,file=null-co://,format=raw\");\n ret = g_test_run();\n qtest_quit(global_qtest);\n\ndiff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c\nindex 0dbed5a36a..0fe52428e6 100644\n--- a/tests/vhost-user-test.c\n+++ b/tests/vhost-user-test.c\n@@ -644,14 +644,14 @@ static void test_migrate(void)\n test_server_listen(s);\n test_server_listen(dest);\n\n- s->qts = qtest_init(GET_QEMU_CMDE(s, 2, \"\", \"\"));\n+ s->qts = qtest_start(GET_QEMU_CMDE(s, 2, \"\", \"\"));\n\n init_virtio_dev(s);\n wait_for_fds(s);\n size = get_log_size(s);\n g_assert_cmpint(size, ==, (2 * 1024 * 1024) / (VHOST_LOG_PAGE * 8));\n\n- dest->qts = qtest_init(GET_QEMU_CMDE(dest, 2, \"\", \" -incoming %s\", uri));\n+ dest->qts = qtest_start(GET_QEMU_CMDE(dest, 2, \"\", \" -incoming %s\", uri));\n\n source = g_source_new(&test_migrate_source_funcs,\n sizeof(TestMigrateSource));\n@@ -746,7 +746,7 @@ static void test_reconnect_subprocess(void)\n TestServer *s = test_server_new(\"reconnect\");\n\n g_thread_new(\"connect\", connect_thread, s);\n- s->qts = qtest_init(GET_QEMU_CMDE(s, 2, \",server\", \"\"));\n+ s->qts = qtest_start(GET_QEMU_CMDE(s, 2, \",server\", \"\"));\n\n init_virtio_dev(s);\n wait_for_fds(s);\n@@ -778,7 +778,7 @@ static void test_connect_fail_subprocess(void)\n\n s->test_fail = true;\n g_thread_new(\"connect\", connect_thread, s);\n- s->qts = qtest_init(GET_QEMU_CMDE(s, 2, \",server\", \"\"));\n+ s->qts = qtest_start(GET_QEMU_CMDE(s, 2, \",server\", \"\"));\n\n init_virtio_dev(s);\n wait_for_fds(s);\n@@ -802,7 +802,7 @@ static void test_flags_mismatch_subprocess(void)\n\n s->test_flags = TEST_FLAGS_DISCONNECT;\n g_thread_new(\"connect\", connect_thread, s);\n- s->qts = qtest_init(GET_QEMU_CMDE(s, 2, \",server\", \"\"));\n+ s->qts = qtest_start(GET_QEMU_CMDE(s, 2, \",server\", \"\"));\n\n init_virtio_dev(s);\n wait_for_fds(s);\n@@ -866,11 +866,11 @@ static void test_multiqueue(void)\n s->queues = queues;\n test_server_listen(s);\n\n- s->qts = qtest_init(QEMU_CMD_MEM QEMU_CMD_CHR QEMU_CMD_NETDEV \",queues=%d \"\n- \"-device virtio-net-pci,netdev=net0,mq=on,vectors=%d\",\n- 512, 512, root, s->chr_name,\n- s->socket_path, \"\", s->chr_name,\n- queues, queues * 2 + 2);\n+ s->qts = qtest_start(QEMU_CMD_MEM QEMU_CMD_CHR QEMU_CMD_NETDEV \",queues=%d \"\n+ \"-device virtio-net-pci,netdev=net0,mq=on,vectors=%d\",\n+ 512, 512, root, s->chr_name,\n+ s->socket_path, \"\", s->chr_name,\n+ queues, queues * 2 + 2);\n\n bus = qpci_init_pc(s->qts, NULL);\n dev = virtio_net_pci_init(bus, PCI_SLOT);\n@@ -931,7 +931,7 @@ int main(int argc, char **argv)\n /* run the main loop thread so the chardev may operate */\n thread = g_thread_new(NULL, thread_function, loop);\n\n- server->qts = qtest_init(GET_QEMU_CMD(server));\n+ server->qts = qtest_start(GET_QEMU_CMD(server));\n init_virtio_dev(server);\n\n qtest_add_data_func(\"/vhost-user/read-guest-mem\", server, read_guest_mem);\ndiff --git a/tests/virtio-balloon-test.c b/tests/virtio-balloon-test.c\nindex 7304392c17..cca7b0e8fb 100644\n--- a/tests/virtio-balloon-test.c\n+++ b/tests/virtio-balloon-test.c\n@@ -22,7 +22,7 @@ int main(int argc, char **argv)\n g_test_init(&argc, &argv, NULL);\n qtest_add_func(\"/virtio/balloon/pci/nop\", pci_nop);\n\n- global_qtest = qtest_init(\"-device virtio-balloon-pci\");\n+ global_qtest = qtest_start(\"-device virtio-balloon-pci\");\n ret = g_test_run();\n\n qtest_quit(global_qtest);\ndiff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c\nindex 063b0f4013..146e182ae9 100644\n--- a/tests/virtio-blk-test.c\n+++ b/tests/virtio-blk-test.c\n@@ -88,10 +88,10 @@ static void arm_test_start(void)\n\n tmp_path = drive_create();\n\n- global_qtest = qtest_init(\"-machine virt \"\n- \"-drive if=none,id=drive0,file=%s,format=raw \"\n- \"-device virtio-blk-device,drive=drive0\",\n- tmp_path);\n+ global_qtest = qtest_start(\"-machine virt \"\n+ \"-drive if=none,id=drive0,file=%s,format=raw \"\n+ \"-device virtio-blk-device,drive=drive0\",\n+ tmp_path);\n unlink(tmp_path);\n g_free(tmp_path);\n }\ndiff --git a/tests/virtio-console-test.c b/tests/virtio-console-test.c\nindex 73fb30b051..ce0da47b2d 100644\n--- a/tests/virtio-console-test.c\n+++ b/tests/virtio-console-test.c\n@@ -13,15 +13,15 @@\n /* Tests only initialization so far. TODO: Replace with functional tests */\n static void console_pci_nop(void)\n {\n- global_qtest = qtest_init(\"-device virtio-serial-pci,id=vser0 \"\n- \"-device virtconsole,bus=vser0.0\");\n+ global_qtest = qtest_start(\"-device virtio-serial-pci,id=vser0 \"\n+ \"-device virtconsole,bus=vser0.0\");\n qtest_quit(global_qtest);\n }\n\n static void serialport_pci_nop(void)\n {\n- global_qtest = qtest_init(\"-device virtio-serial-pci,id=vser0 \"\n- \"-device virtserialport,bus=vser0.0\");\n+ global_qtest = qtest_start(\"-device virtio-serial-pci,id=vser0 \"\n+ \"-device virtserialport,bus=vser0.0\");\n qtest_quit(global_qtest);\n }\n\ndiff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c\nindex 9b32866fb1..13a4116d26 100644\n--- a/tests/virtio-net-test.c\n+++ b/tests/virtio-net-test.c\n@@ -243,7 +243,7 @@ static void hotplug(void)\n {\n const char *arch = qtest_get_arch();\n\n- global_qtest = qtest_init(\"-device virtio-net-pci\");\n+ global_qtest = qtest_start(\"-device virtio-net-pci\");\n\n qpci_plug_device_test(\"virtio-net-pci\", \"net1\", PCI_SLOT_HP, NULL);\n\ndiff --git a/tests/virtio-rng-test.c b/tests/virtio-rng-test.c\nindex e1b1e89b59..64b2bd4b19 100644\n--- a/tests/virtio-rng-test.c\n+++ b/tests/virtio-rng-test.c\n@@ -37,7 +37,7 @@ int main(int argc, char **argv)\n qtest_add_func(\"/virtio/rng/pci/nop\", pci_nop);\n qtest_add_func(\"/virtio/rng/pci/hotplug\", hotplug);\n\n- global_qtest = qtest_init(\"-device virtio-rng-pci\");\n+ global_qtest = qtest_start(\"-device virtio-rng-pci\");\n ret = g_test_run();\n\n qtest_quit(global_qtest);\ndiff --git a/tests/virtio-serial-test.c b/tests/virtio-serial-test.c\nindex ce708cc11e..1cc43465e6 100644\n--- a/tests/virtio-serial-test.c\n+++ b/tests/virtio-serial-test.c\n@@ -49,7 +49,7 @@ int main(int argc, char **argv)\n qtest_add_func(\"/virtio/serial/pci/nop\", pci_nop);\n qtest_add_func(\"/virtio/serial/pci/hotplug\", hotplug);\n\n- global_qtest = qtest_init(\"-device virtio-serial-pci\");\n+ global_qtest = qtest_start(\"-device virtio-serial-pci\");\n ret = g_test_run();\n\n qtest_quit(global_qtest);\ndiff --git a/tests/vmgenid-test.c b/tests/vmgenid-test.c\nindex b149690a1a..832c82c32f 100644\n--- a/tests/vmgenid-test.c\n+++ b/tests/vmgenid-test.c\n@@ -142,7 +142,7 @@ static void vmgenid_set_guid_test(void)\n\n g_assert(qemu_uuid_parse(VGID_GUID, &expected) == 0);\n\n- global_qtest = qtest_init(GUID_CMD(VGID_GUID));\n+ global_qtest = qtest_start(GUID_CMD(VGID_GUID));\n\n /* Read the GUID from accessing guest memory */\n read_guid_from_memory(&measured);\n@@ -155,7 +155,7 @@ static void vmgenid_set_guid_auto_test(void)\n {\n QemuUUID measured;\n\n- global_qtest = qtest_init(GUID_CMD(\"auto\"));\n+ global_qtest = qtest_start(GUID_CMD(\"auto\"));\n\n read_guid_from_memory(&measured);\n\n@@ -171,7 +171,7 @@ static void vmgenid_query_monitor_test(void)\n\n g_assert(qemu_uuid_parse(VGID_GUID, &expected) == 0);\n\n- global_qtest = qtest_init(GUID_CMD(VGID_GUID));\n+ global_qtest = qtest_start(GUID_CMD(VGID_GUID));\n\n /* Read the GUID via the monitor */\n read_guid_from_monitor(&measured);\ndiff --git a/tests/vmxnet3-test.c b/tests/vmxnet3-test.c\nindex c9a876bcd9..0b4b807616 100644\n--- a/tests/vmxnet3-test.c\n+++ b/tests/vmxnet3-test.c\n@@ -22,7 +22,7 @@ int main(int argc, char **argv)\n g_test_init(&argc, &argv, NULL);\n qtest_add_func(\"/vmxnet3/nop\", nop);\n\n- global_qtest = qtest_init(\"-device vmxnet3\");\n+ global_qtest = qtest_start(\"-device vmxnet3\");\n ret = g_test_run();\n\n qtest_quit(global_qtest);\ndiff --git a/tests/wdt_ib700-test.c b/tests/wdt_ib700-test.c\nindex 4bb8374011..a169265e16 100644\n--- a/tests/wdt_ib700-test.c\n+++ b/tests/wdt_ib700-test.c\n@@ -56,7 +56,7 @@ static QDict *ib700_program_and_wait(QTestState *s)\n static void ib700_pause(void)\n {\n QDict *d;\n- QTestState *s = qtest_init(\"-watchdog-action pause -device ib700\");\n+ QTestState *s = qtest_start(\"-watchdog-action pause -device ib700\");\n\n qtest_irq_intercept_in(s, \"ioapic\");\n d = ib700_program_and_wait(s);\n@@ -69,7 +69,7 @@ static void ib700_pause(void)\n static void ib700_reset(void)\n {\n QDict *d;\n- QTestState *s = qtest_init(\"-watchdog-action reset -device ib700\");\n+ QTestState *s = qtest_start(\"-watchdog-action reset -device ib700\");\n\n qtest_irq_intercept_in(s, \"ioapic\");\n d = ib700_program_and_wait(s);\n@@ -84,7 +84,7 @@ static void ib700_shutdown(void)\n QDict *d;\n QTestState *s;\n\n- s = qtest_init(\"-watchdog-action reset -no-reboot -device ib700\");\n+ s = qtest_start(\"-watchdog-action reset -no-reboot -device ib700\");\n qtest_irq_intercept_in(s, \"ioapic\");\n d = ib700_program_and_wait(s);\n g_assert(!strcmp(qdict_get_str(d, \"action\"), \"reset\"));\n@@ -96,7 +96,7 @@ static void ib700_shutdown(void)\n static void ib700_none(void)\n {\n QDict *d;\n- QTestState *s = qtest_init(\"-watchdog-action none -device ib700\");\n+ QTestState *s = qtest_start(\"-watchdog-action none -device ib700\");\n\n qtest_irq_intercept_in(s, \"ioapic\");\n d = ib700_program_and_wait(s);\n", "prefixes": [ "v6", "29/29" ] }