From nobody Tue Feb 10 07:42:49 2026 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 1542049855258938.2286844315092; Mon, 12 Nov 2018 11:10:55 -0800 (PST) Received: from localhost ([::1]:50340 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMHbn-0006WQ-0b for importer@patchew.org; Mon, 12 Nov 2018 14:10:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48748) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMHZq-0005JY-HJ for qemu-devel@nongnu.org; Mon, 12 Nov 2018 14:08:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gMHZo-00049T-Be for qemu-devel@nongnu.org; Mon, 12 Nov 2018 14:08:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37308) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gMHZo-000418-1P for qemu-devel@nongnu.org; Mon, 12 Nov 2018 14:08:48 -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 D232DC0587CE; Mon, 12 Nov 2018 19:08:27 +0000 (UTC) Received: from thuth.com (ovpn-116-32.ams2.redhat.com [10.36.116.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4CE4260C6B; Mon, 12 Nov 2018 19:08:26 +0000 (UTC) From: Thomas Huth To: Eric Blake , qemu-devel@nongnu.org Date: Mon, 12 Nov 2018 20:08:09 +0100 Message-Id: <1542049690-12826-7-git-send-email-thuth@redhat.com> In-Reply-To: <1542049690-12826-1-git-send-email-thuth@redhat.com> References: <1542049690-12826-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.32]); Mon, 12 Nov 2018 19:08:27 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-3.2 6/7] tests/vmgenid: 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: Laurent Vivier , Igor Mammedov , John Snow , Ben Warren , Paolo Bonzini 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" The biggest part has already been done in the previous patch, we now only have to replace some few qmp() and readb() calls with the corresponding qtest_*() functions to get there. Signed-off-by: Thomas Huth Acked-by: Igor Mammedov --- tests/vmgenid-test.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/tests/vmgenid-test.c b/tests/vmgenid-test.c index c9c4f8c..84449ce 100644 --- a/tests/vmgenid-test.c +++ b/tests/vmgenid-test.c @@ -95,17 +95,17 @@ static uint32_t acpi_find_vgia(QTestState *qts) return guid_offset; } =20 -static void read_guid_from_memory(QemuUUID *guid) +static void read_guid_from_memory(QTestState *qts, QemuUUID *guid) { uint32_t vmgenid_addr; int i; =20 - vmgenid_addr =3D acpi_find_vgia(global_qtest); + vmgenid_addr =3D acpi_find_vgia(qts); g_assert(vmgenid_addr); =20 /* Read the GUID directly from guest memory */ for (i =3D 0; i < 16; i++) { - guid->data[i] =3D readb(vmgenid_addr + i); + guid->data[i] =3D qtest_readb(qts, vmgenid_addr + i); } /* The GUID is in little-endian format in the guest, while QEMU * uses big-endian. Swap after reading. @@ -113,12 +113,12 @@ static void read_guid_from_memory(QemuUUID *guid) qemu_uuid_bswap(guid); } =20 -static void read_guid_from_monitor(QemuUUID *guid) +static void read_guid_from_monitor(QTestState *qts, QemuUUID *guid) { QDict *rsp, *rsp_ret; const char *guid_str; =20 - rsp =3D qmp("{ 'execute': 'query-vm-generation-id' }"); + rsp =3D qtest_qmp(qts, "{ 'execute': 'query-vm-generation-id' }"); if (qdict_haskey(rsp, "return")) { rsp_ret =3D qdict_get_qdict(rsp, "return"); g_assert(qdict_haskey(rsp_ret, "guid")); @@ -139,45 +139,48 @@ static char disk[] =3D "tests/vmgenid-test-disk-XXXXX= X"; static void vmgenid_set_guid_test(void) { QemuUUID expected, measured; + QTestState *qts; =20 g_assert(qemu_uuid_parse(VGID_GUID, &expected) =3D=3D 0); =20 - global_qtest =3D qtest_initf(GUID_CMD(VGID_GUID)); + qts =3D qtest_initf(GUID_CMD(VGID_GUID)); =20 /* Read the GUID from accessing guest memory */ - read_guid_from_memory(&measured); + read_guid_from_memory(qts, &measured); g_assert(memcmp(measured.data, expected.data, sizeof(measured.data)) = =3D=3D 0); =20 - qtest_quit(global_qtest); + qtest_quit(qts); } =20 static void vmgenid_set_guid_auto_test(void) { QemuUUID measured; + QTestState *qts; =20 - global_qtest =3D qtest_initf(GUID_CMD("auto")); + qts =3D qtest_initf(GUID_CMD("auto")); =20 - read_guid_from_memory(&measured); + read_guid_from_memory(qts, &measured); =20 /* Just check that the GUID is non-null */ g_assert(!qemu_uuid_is_null(&measured)); =20 - qtest_quit(global_qtest); + qtest_quit(qts); } =20 static void vmgenid_query_monitor_test(void) { QemuUUID expected, measured; + QTestState *qts; =20 g_assert(qemu_uuid_parse(VGID_GUID, &expected) =3D=3D 0); =20 - global_qtest =3D qtest_initf(GUID_CMD(VGID_GUID)); + qts =3D qtest_initf(GUID_CMD(VGID_GUID)); =20 /* Read the GUID via the monitor */ - read_guid_from_monitor(&measured); + read_guid_from_monitor(qts, &measured); g_assert(memcmp(measured.data, expected.data, sizeof(measured.data)) = =3D=3D 0); =20 - qtest_quit(global_qtest); + qtest_quit(qts); } =20 int main(int argc, char **argv) --=20 1.8.3.1