From nobody Fri Apr 26 23:40:43 2024 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1500045458859357.69853820274545; Fri, 14 Jul 2017 08:17:38 -0700 (PDT) Received: from localhost ([::1]:38497 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dW2LV-0001xY-Ek for importer@patchew.org; Fri, 14 Jul 2017 11:17:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33371) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dW2I9-00077d-IJ for qemu-devel@nongnu.org; Fri, 14 Jul 2017 11:14:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dW2I5-00029h-He for qemu-devel@nongnu.org; Fri, 14 Jul 2017 11:14:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59432) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dW2I5-00029H-8t for qemu-devel@nongnu.org; Fri, 14 Jul 2017 11:14:01 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4860C16546A; Fri, 14 Jul 2017 15:14:00 +0000 (UTC) Received: from redhat.com (ovpn-125-232.rdu2.redhat.com [10.10.125.232]) by smtp.corp.redhat.com (Postfix) with SMTP id 75A8165E86; Fri, 14 Jul 2017 15:13:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 4860C16546A Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=mst@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 4860C16546A Date: Fri, 14 Jul 2017 18:13:59 +0300 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1500045231-23322-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 14 Jul 2017 15:14:00 +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] vmgenid-test: use boot-sector infrastructure 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: Peter Maydell , Laszlo Ersek , Ben Warren 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 Content-Type: text/plain; charset="utf-8" There's no requirement for RSDP to be installed last by the firmware, so in rare cases vmgen id test hits a race: RSDP is there but VM GEN ID isn't. To fix, switch to common boot sector infrastructure. Cc: Laszlo Ersek Cc: Peter Maydell Cc: Ben Warren Signed-off-by: Michael S. Tsirkin --- tests/vmgenid-test.c | 45 +++++++++++++++++++++++++++++---------------- tests/Makefile.include | 2 +- 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/tests/vmgenid-test.c b/tests/vmgenid-test.c index e7ba38c..0556ba2 100644 --- a/tests/vmgenid-test.c +++ b/tests/vmgenid-test.c @@ -15,6 +15,7 @@ #include "qemu/bitmap.h" #include "qemu/uuid.h" #include "hw/acpi/acpi-defs.h" +#include "boot-sector.h" #include "acpi-utils.h" #include "libqtest.h" =20 @@ -23,8 +24,6 @@ * OVMF SDT Header Probe Supressor */ #define RSDP_ADDR_INVALID 0x100000 /* RSDP must be below this address */ -#define RSDP_SLEEP_US 100000 /* Sleep for 100ms between tries */ -#define RSDP_TRIES_MAX 100 /* Max total time is 10 seconds */ =20 typedef struct { AcpiTableHeader header; @@ -47,14 +46,12 @@ static uint32_t acpi_find_vgia(void) VgidTable vgid_table; int i; =20 - /* Tables may take a short time to be set up by the guest */ - for (i =3D 0; i < RSDP_TRIES_MAX; i++) { - rsdp_offset =3D acpi_find_rsdp_address(); - if (rsdp_offset < RSDP_ADDR_INVALID) { - break; - } - g_usleep(RSDP_SLEEP_US); - } + /* Wait for guest firmware to finish and start the payload. */ + boot_sector_test(); + + /* Tables should be initialized now. */ + rsdp_offset =3D acpi_find_rsdp_address(); + g_assert_cmphex(rsdp_offset, <, RSDP_ADDR_INVALID); =20 acpi_parse_rsdp_table(rsdp_offset, &rsdp_table); @@ -131,6 +128,18 @@ static void read_guid_from_monitor(QemuUUID *guid) QDECREF(rsp); } =20 +static char disk[] =3D "tests/vmgenid-test-disk-XXXXXX"; + +static char *guid_cmd_strdup(const char *guid) +{ + return g_strdup_printf("-machine accel=3Dtcg " + "-device vmgenid,id=3Dtestvgid,guid=3D%s " + "-drive id=3Dhd0,if=3Dnone,file=3D%s,format=3Dr= aw " + "-device ide-hd,drive=3Dhd0 ", + guid, disk); +} + + static void vmgenid_set_guid_test(void) { QemuUUID expected, measured; @@ -138,8 +147,7 @@ static void vmgenid_set_guid_test(void) =20 g_assert(qemu_uuid_parse(VGID_GUID, &expected) =3D=3D 0); =20 - cmd =3D g_strdup_printf("-machine accel=3Dtcg -device vmgenid,id=3Dtes= tvgid," - "guid=3D%s", VGID_GUID); + cmd =3D guid_cmd_strdup(VGID_GUID); qtest_start(cmd); =20 /* Read the GUID from accessing guest memory */ @@ -152,10 +160,10 @@ static void vmgenid_set_guid_test(void) =20 static void vmgenid_set_guid_auto_test(void) { - const char *cmd; + char *cmd; QemuUUID measured; =20 - cmd =3D "-machine accel=3Dtcg -device vmgenid,id=3Dtestvgid," "guid=3D= auto"; + cmd =3D guid_cmd_strdup("auto"); qtest_start(cmd); =20 read_guid_from_memory(&measured); @@ -164,6 +172,7 @@ static void vmgenid_set_guid_auto_test(void) g_assert(!qemu_uuid_is_null(&measured)); =20 qtest_quit(global_qtest); + g_free(cmd); } =20 static void vmgenid_query_monitor_test(void) @@ -173,8 +182,7 @@ static void vmgenid_query_monitor_test(void) =20 g_assert(qemu_uuid_parse(VGID_GUID, &expected) =3D=3D 0); =20 - cmd =3D g_strdup_printf("-machine accel=3Dtcg -device vmgenid,id=3Dtes= tvgid," - "guid=3D%s", VGID_GUID); + cmd =3D guid_cmd_strdup(VGID_GUID); qtest_start(cmd); =20 /* Read the GUID via the monitor */ @@ -189,6 +197,10 @@ int main(int argc, char **argv) { int ret; =20 + ret =3D boot_sector_init(disk); + if(ret) + return ret; + g_test_init(&argc, &argv, NULL); =20 qtest_add_func("/vmgenid/vmgenid/set-guid", @@ -198,6 +210,7 @@ int main(int argc, char **argv) qtest_add_func("/vmgenid/vmgenid/query-monitor", vmgenid_query_monitor_test); ret =3D g_test_run(); + boot_sector_cleanup(disk); =20 return ret; } diff --git a/tests/Makefile.include b/tests/Makefile.include index 18cd06a..aef374b 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -761,7 +761,7 @@ tests/test-uuid$(EXESUF): tests/test-uuid.o $(test-util= -obj-y) tests/test-arm-mptimer$(EXESUF): tests/test-arm-mptimer.o tests/test-qapi-util$(EXESUF): tests/test-qapi-util.o $(test-util-obj-y) tests/numa-test$(EXESUF): tests/numa-test.o -tests/vmgenid-test$(EXESUF): tests/vmgenid-test.o tests/acpi-utils.o +tests/vmgenid-test$(EXESUF): tests/vmgenid-test.o tests/boot-sector.o test= s/acpi-utils.o =20 tests/migration/stress$(EXESUF): tests/migration/stress.o $(call quiet-command, $(LINKPROG) -static -O3 $(PTHREAD_LIB) -o $@ $< ,"L= INK","$(TARGET_DIR)$@") --=20 MST