From nobody Fri Nov 7 05:38:57 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=listsout.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.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 listsout.gnu.org (listsout.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1546513926254478.9996679321448; Thu, 3 Jan 2019 03:12:06 -0800 (PST) Received: from localhost ([127.0.0.1]:52202 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gf0uu-0004uK-LU for importer@patchew.org; Thu, 03 Jan 2019 06:12:00 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39612) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gf0t4-0003Kz-Be for qemu-devel@nongnu.org; Thu, 03 Jan 2019 06:10:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gf0t2-000211-9m for qemu-devel@nongnu.org; Thu, 03 Jan 2019 06:10:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53444) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gf0t1-00020J-UN for qemu-devel@nongnu.org; Thu, 03 Jan 2019 06:10:04 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A15534E90E; Thu, 3 Jan 2019 11:10:02 +0000 (UTC) Received: from thuth.com (dhcp-200-199.str.redhat.com [10.33.200.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A0F260BEC; Thu, 3 Jan 2019 11:09:58 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Laurent Vivier Date: Thu, 3 Jan 2019 12:09:51 +0100 Message-Id: <1546513792-17773-3-git-send-email-thuth@redhat.com> In-Reply-To: <1546513792-17773-1-git-send-email-thuth@redhat.com> References: <1546513792-17773-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 03 Jan 2019 11:10:02 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/3] tests/boot-order: Make test independent of global_qtest 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: , Cc: Paolo Bonzini , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Pass around the QTestState from function to function, so that we can finally get rid of the out-of-favor global_qtest variable in this file, too. Signed-off-by: Thomas Huth --- tests/boot-order-test.c | 59 ++++++++++++++++++++++++---------------------= ---- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/tests/boot-order-test.c b/tests/boot-order-test.c index c60ebcf..a725bce 100644 --- a/tests/boot-order-test.c +++ b/tests/boot-order-test.c @@ -17,7 +17,7 @@ #include "standard-headers/linux/qemu_fw_cfg.h" =20 /* TODO actually test the results and get rid of this */ -#define qmp_discard_response(...) qobject_unref(qmp(__VA_ARGS__)) +#define qmp_discard_response(qs, ...) qobject_unref(qtest_qmp(qs, __VA_ARG= S__)) =20 typedef struct { const char *args; @@ -27,31 +27,30 @@ typedef struct { =20 static void test_a_boot_order(const char *machine, const char *test_args, - uint64_t (*read_boot_order)(void), + uint64_t (*read_boot_order)(QTestState *), uint64_t expected_boot, uint64_t expected_reboot) { uint64_t actual; + QTestState *qts; =20 - global_qtest =3D qtest_initf("-nodefaults%s%s %s", - machine ? " -M " : "", - machine ?: "", - test_args); - actual =3D read_boot_order(); + qts =3D qtest_initf("-nodefaults%s%s %s", machine ? " -M " : "", + machine ?: "", test_args); + actual =3D read_boot_order(qts); g_assert_cmphex(actual, =3D=3D, expected_boot); - qmp_discard_response("{ 'execute': 'system_reset' }"); + qmp_discard_response(qts, "{ 'execute': 'system_reset' }"); /* * system_reset only requests reset. We get a RESET event after * the actual reset completes. Need to wait for that. */ - qmp_eventwait("RESET"); - actual =3D read_boot_order(); + qtest_qmp_eventwait(qts, "RESET"); + actual =3D read_boot_order(qts); g_assert_cmphex(actual, =3D=3D, expected_reboot); - qtest_quit(global_qtest); + qtest_quit(qts); } =20 static void test_boot_orders(const char *machine, - uint64_t (*read_boot_order)(void), + uint64_t (*read_boot_order)(QTestState *), const boot_order_test *tests) { int i; @@ -64,16 +63,16 @@ static void test_boot_orders(const char *machine, } } =20 -static uint8_t read_mc146818(uint16_t port, uint8_t reg) +static uint8_t read_mc146818(QTestState *qts, uint16_t port, uint8_t reg) { - outb(port, reg); - return inb(port + 1); + qtest_outb(qts, port, reg); + return qtest_inb(qts, port + 1); } =20 -static uint64_t read_boot_order_pc(void) +static uint64_t read_boot_order_pc(QTestState *qts) { - uint8_t b1 =3D read_mc146818(0x70, 0x38); - uint8_t b2 =3D read_mc146818(0x70, 0x3d); + uint8_t b1 =3D read_mc146818(qts, 0x70, 0x38); + uint8_t b2 =3D read_mc146818(qts, 0x70, 0x3d); =20 return b1 | (b2 << 8); } @@ -109,16 +108,16 @@ static void test_pc_boot_order(void) test_boot_orders(NULL, read_boot_order_pc, test_cases_pc); } =20 -static uint8_t read_m48t59(uint64_t addr, uint16_t reg) +static uint8_t read_m48t59(QTestState *qts, uint64_t addr, uint16_t reg) { - writeb(addr, reg & 0xff); - writeb(addr + 1, reg >> 8); - return readb(addr + 3); + qtest_writeb(qts, addr, reg & 0xff); + qtest_writeb(qts, addr + 1, reg >> 8); + return qtest_readb(qts, addr + 3); } =20 -static uint64_t read_boot_order_prep(void) +static uint64_t read_boot_order_prep(QTestState *qts) { - return read_m48t59(0x80000000 + 0x74, 0x34); + return read_m48t59(qts, 0x80000000 + 0x74, 0x34); } =20 static const boot_order_test test_cases_prep[] =3D { @@ -133,9 +132,9 @@ static void test_prep_boot_order(void) test_boot_orders("prep", read_boot_order_prep, test_cases_prep); } =20 -static uint64_t read_boot_order_pmac(void) +static uint64_t read_boot_order_pmac(QTestState *qts) { - QFWCFG *fw_cfg =3D mm_fw_cfg_init(global_qtest, 0xf0000510); + QFWCFG *fw_cfg =3D mm_fw_cfg_init(qts, 0xf0000510); =20 return qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_DEVICE); } @@ -158,9 +157,9 @@ static void test_pmac_newworld_boot_order(void) test_boot_orders("mac99", read_boot_order_pmac, test_cases_fw_cfg); } =20 -static uint64_t read_boot_order_sun4m(void) +static uint64_t read_boot_order_sun4m(QTestState *qts) { - QFWCFG *fw_cfg =3D mm_fw_cfg_init(global_qtest, 0xd00000510ULL); + QFWCFG *fw_cfg =3D mm_fw_cfg_init(qts, 0xd00000510ULL); =20 return qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_DEVICE); } @@ -170,9 +169,9 @@ static void test_sun4m_boot_order(void) test_boot_orders("SS-5", read_boot_order_sun4m, test_cases_fw_cfg); } =20 -static uint64_t read_boot_order_sun4u(void) +static uint64_t read_boot_order_sun4u(QTestState *qts) { - QFWCFG *fw_cfg =3D io_fw_cfg_init(global_qtest, 0x510); + QFWCFG *fw_cfg =3D io_fw_cfg_init(qts, 0x510); =20 return qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_DEVICE); } --=20 1.8.3.1