From nobody Sat Oct 25 08:29:46 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1518607570698595.2899888158145; Wed, 14 Feb 2018 03:26:10 -0800 (PST) Received: from localhost ([::1]:37552 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elvCT-0002XS-QB for importer@patchew.org; Wed, 14 Feb 2018 06:26:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elv7O-0006L6-MY for qemu-devel@nongnu.org; Wed, 14 Feb 2018 06:20:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1elv7M-0007B4-Pn for qemu-devel@nongnu.org; Wed, 14 Feb 2018 06:20:54 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:41984 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1elv7M-0007Ap-KZ for qemu-devel@nongnu.org; Wed, 14 Feb 2018 06:20:52 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3B2078182D2F; Wed, 14 Feb 2018 11:20:52 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-136.ams2.redhat.com [10.36.116.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 61E192024CA4; Wed, 14 Feb 2018 11:20:51 +0000 (UTC) From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Date: Wed, 14 Feb 2018 12:20:24 +0100 Message-Id: <1518607234-17739-9-git-send-email-thuth@redhat.com> In-Reply-To: <1518607234-17739-1-git-send-email-thuth@redhat.com> References: <1518607234-17739-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Wed, 14 Feb 2018 11:20:52 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Wed, 14 Feb 2018 11:20:52 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'thuth@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 08/18] libqos: Use explicit QTestState for remaining libqos operations X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Eric Blake Drop one more client of global_qtest by teaching all remaining libqos stragglers to pass in an explicit QTestState. Change the setting of global_qtest from being implicit in libqos' call to qtest_start() to instead be explicit in all clients that are still relying on global_qtest. Note that qmp_execute() can be greatly simplified in the process, and that we also get rid of interpolation of a JSON string into a temporary variable when qtest_qmp() can do it more reliably. Signed-off-by: Eric Blake Acked-by: Greg Kurz Reviewed-by: John Snow Signed-off-by: Thomas Huth --- tests/ahci-test.c | 1 + tests/ivshmem-test.c | 1 + tests/libqos/libqos-pc.c | 2 +- tests/libqos/libqos.c | 30 ++++++++++-------------------- tests/megasas-test.c | 5 ++++- tests/rtas-test.c | 1 + tests/usb-hcd-uhci-test.c | 1 + tests/virtio-9p-test.c | 1 + tests/virtio-blk-test.c | 1 + tests/virtio-net-test.c | 15 +++++++++------ tests/virtio-scsi-test.c | 16 +++++++++------- 11 files changed, 39 insertions(+), 35 deletions(-) diff --git a/tests/ahci-test.c b/tests/ahci-test.c index e847c98..2342fe3 100644 --- a/tests/ahci-test.c +++ b/tests/ahci-test.c @@ -158,6 +158,7 @@ static AHCIQState *ahci_vboot(const char *cli, va_list = ap) =20 s =3D g_new0(AHCIQState, 1); s->parent =3D qtest_pc_vboot(cli, ap); + global_qtest =3D s->parent->qts; alloc_set_flags(s->parent->alloc, ALLOC_LEAK_ASSERT); =20 /* Verify that we have an AHCI device present. */ diff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c index 3776342..8af16ee 100644 --- a/tests/ivshmem-test.c +++ b/tests/ivshmem-test.c @@ -131,6 +131,7 @@ static void setup_vm_cmd(IVState *s, const char *cmd, b= ool msix) g_printerr("ivshmem-test tests are only available on x86 or ppc64\= n"); exit(EXIT_FAILURE); } + global_qtest =3D s->qs->qts; s->dev =3D get_device(s->qs->pcibus); =20 s->reg_bar =3D qpci_iomap(s->dev, 0, &barsize); diff --git a/tests/libqos/libqos-pc.c b/tests/libqos/libqos-pc.c index b554758..a9c1ace 100644 --- a/tests/libqos/libqos-pc.c +++ b/tests/libqos/libqos-pc.c @@ -25,7 +25,7 @@ QOSState *qtest_pc_boot(const char *cmdline_fmt, ...) qs =3D qtest_vboot(&qos_ops, cmdline_fmt, ap); va_end(ap); =20 - qtest_irq_intercept_in(global_qtest, "ioapic"); + qtest_irq_intercept_in(qs->qts, "ioapic"); =20 return qs; } diff --git a/tests/libqos/libqos.c b/tests/libqos/libqos.c index 5729a06..5124e98 100644 --- a/tests/libqos/libqos.c +++ b/tests/libqos/libqos.c @@ -21,7 +21,7 @@ QOSState *qtest_vboot(QOSOps *ops, const char *cmdline_fm= t, va_list ap) QOSState *qs =3D g_new0(QOSState, 1); =20 cmdline =3D g_strdup_vprintf(cmdline_fmt, ap); - qs->qts =3D qtest_start(cmdline); + qs->qts =3D qtest_init(cmdline); qs->ops =3D ops; if (ops) { qs->alloc =3D ops->init_allocator(qs->qts, ALLOC_NO_FLAGS); @@ -81,29 +81,21 @@ void set_context(QOSState *s) global_qtest =3D s->qts; } =20 -static QDict *qmp_execute(const char *command) +static QDict *qmp_execute(QTestState *qts, const char *command) { - char *fmt; - QDict *rsp; - - fmt =3D g_strdup_printf("{ 'execute': '%s' }", command); - rsp =3D qmp(fmt); - g_free(fmt); - - return rsp; + return qtest_qmp(qts, "{ 'execute': %s }", command); } =20 void migrate(QOSState *from, QOSState *to, const char *uri) { const char *st; - char *s; QDict *rsp, *sub; bool running; =20 set_context(from); =20 /* Is the machine currently running? */ - rsp =3D qmp_execute("query-status"); + rsp =3D qmp_execute(from->qts, "query-status"); g_assert(qdict_haskey(rsp, "return")); sub =3D qdict_get_qdict(rsp, "return"); g_assert(qdict_haskey(sub, "running")); @@ -111,30 +103,28 @@ void migrate(QOSState *from, QOSState *to, const char= *uri) QDECREF(rsp); =20 /* Issue the migrate command. */ - s =3D g_strdup_printf("{ 'execute': 'migrate'," - "'arguments': { 'uri': '%s' } }", - uri); - rsp =3D qmp(s); - g_free(s); + rsp =3D qtest_qmp(from->qts, + "{ 'execute': 'migrate', 'arguments': { 'uri': %s }}", + uri); g_assert(qdict_haskey(rsp, "return")); QDECREF(rsp); =20 /* Wait for STOP event, but only if we were running: */ if (running) { - qmp_eventwait("STOP"); + qtest_qmp_eventwait(from->qts, "STOP"); } =20 /* If we were running, we can wait for an event. */ if (running) { migrate_allocator(from->alloc, to->alloc); set_context(to); - qmp_eventwait("RESUME"); + qtest_qmp_eventwait(to->qts, "RESUME"); return; } =20 /* Otherwise, we need to wait: poll until migration is completed. */ while (1) { - rsp =3D qmp_execute("query-migrate"); + rsp =3D qmp_execute(from->qts, "query-migrate"); g_assert(qdict_haskey(rsp, "return")); sub =3D qdict_get_qdict(rsp, "return"); g_assert(qdict_haskey(sub, "status")); diff --git a/tests/megasas-test.c b/tests/megasas-test.c index ce960e7..81837e1 100644 --- a/tests/megasas-test.c +++ b/tests/megasas-test.c @@ -15,13 +15,16 @@ =20 static QOSState *qmegasas_start(const char *extra_opts) { + QOSState *qs; const char *arch =3D qtest_get_arch(); const char *cmd =3D "-drive id=3Dhd0,if=3Dnone,file=3Dnull-co://,forma= t=3Draw " "-device megasas,id=3Dscsi0,addr=3D04.0 " "-device scsi-hd,bus=3Dscsi0.0,drive=3Dhd0 %s"; =20 if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { - return qtest_pc_boot(cmd, extra_opts ? : ""); + qs =3D qtest_pc_boot(cmd, extra_opts ? : ""); + global_qtest =3D qs->qts; + return qs; } =20 g_printerr("virtio-scsi tests are only available on x86 or ppc64\n"); diff --git a/tests/rtas-test.c b/tests/rtas-test.c index 34a6921..009bda6 100644 --- a/tests/rtas-test.c +++ b/tests/rtas-test.c @@ -14,6 +14,7 @@ static void test_rtas_get_time_of_day(void) time_t t1, t2; =20 qs =3D qtest_spapr_boot("-machine pseries"); + global_qtest =3D qs->qts; =20 t1 =3D time(NULL); ret =3D qrtas_get_time_of_day(qs->qts, qs->alloc, &tm, &ns); diff --git a/tests/usb-hcd-uhci-test.c b/tests/usb-hcd-uhci-test.c index 62e0c78..6a7e5a2 100644 --- a/tests/usb-hcd-uhci-test.c +++ b/tests/usb-hcd-uhci-test.c @@ -77,6 +77,7 @@ int main(int argc, char **argv) "available on x86 or ppc64\n"); exit(EXIT_FAILURE); } + global_qtest =3D qs->qts; ret =3D g_test_run(); qtest_shutdown(qs); =20 diff --git a/tests/virtio-9p-test.c b/tests/virtio-9p-test.c index 54edcb9..a2b3108 100644 --- a/tests/virtio-9p-test.c +++ b/tests/virtio-9p-test.c @@ -44,6 +44,7 @@ static QVirtIO9P *qvirtio_9p_start(const char *driver) g_printerr("virtio-9p tests are only available on x86 or ppc64\n"); exit(EXIT_FAILURE); } + global_qtest =3D v9p->qs->qts; =20 return v9p; } diff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c index 2ac64e5..9be9ffb 100644 --- a/tests/virtio-blk-test.c +++ b/tests/virtio-blk-test.c @@ -77,6 +77,7 @@ static QOSState *pci_test_start(void) g_printerr("virtio-blk tests are only available on x86 or ppc64\n"= ); exit(EXIT_FAILURE); } + global_qtest =3D qs->qts; unlink(tmp_path); g_free(tmp_path); return qs; diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c index 4114839..0a3c5dd 100644 --- a/tests/virtio-net-test.c +++ b/tests/virtio-net-test.c @@ -54,18 +54,21 @@ static QVirtioPCIDevice *virtio_net_pci_init(QPCIBus *b= us, int slot) =20 static QOSState *pci_test_start(int socket) { + QOSState *qs; const char *arch =3D qtest_get_arch(); const char *cmd =3D "-netdev socket,fd=3D%d,id=3Dhs0 -device " "virtio-net-pci,netdev=3Dhs0"; =20 if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { - return qtest_pc_boot(cmd, socket); - } - if (strcmp(arch, "ppc64") =3D=3D 0) { - return qtest_spapr_boot(cmd, socket); + qs =3D qtest_pc_boot(cmd, socket); + } else if (strcmp(arch, "ppc64") =3D=3D 0) { + qs =3D qtest_spapr_boot(cmd, socket); + } else { + g_printerr("virtio-net tests are only available on x86 or ppc64\n"= ); + exit(EXIT_FAILURE); } - g_printerr("virtio-net tests are only available on x86 or ppc64\n"); - exit(EXIT_FAILURE); + global_qtest =3D qs->qts; + return qs; } =20 static void driver_init(QVirtioDevice *dev) diff --git a/tests/virtio-scsi-test.c b/tests/virtio-scsi-test.c index bcf408f..7393d69 100644 --- a/tests/virtio-scsi-test.c +++ b/tests/virtio-scsi-test.c @@ -34,20 +34,22 @@ typedef struct { =20 static QOSState *qvirtio_scsi_start(const char *extra_opts) { + QOSState *qs; const char *arch =3D qtest_get_arch(); const char *cmd =3D "-drive id=3Ddrv0,if=3Dnone,file=3Dnull-co://,form= at=3Draw " "-device virtio-scsi-pci,id=3Dvs0 " "-device scsi-hd,bus=3Dvs0.0,drive=3Ddrv0 %s"; =20 if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { - return qtest_pc_boot(cmd, extra_opts ? : ""); - } - if (strcmp(arch, "ppc64") =3D=3D 0) { - return qtest_spapr_boot(cmd, extra_opts ? : ""); + qs =3D qtest_pc_boot(cmd, extra_opts ? : ""); + } else if (strcmp(arch, "ppc64") =3D=3D 0) { + qs =3D qtest_spapr_boot(cmd, extra_opts ? : ""); + } else { + g_printerr("virtio-scsi tests are only available on x86 or ppc64\n= "); + exit(EXIT_FAILURE); } - - g_printerr("virtio-scsi tests are only available on x86 or ppc64\n"); - exit(EXIT_FAILURE); + global_qtest =3D qs->qts; + return qs; } =20 static void qvirtio_scsi_stop(QOSState *qs) --=20 1.8.3.1