From nobody Mon Feb 9 04:31:52 2026 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=lists.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 ARC-Seal: i=1; a=rsa-sha256; t=1556810146; cv=none; d=zoho.com; s=zohoarc; b=By3XXJPQJAdTQIfMyNc/uQ18xfH8N2lyBu6bfczxCuYqvQ7A1BVLVVX6dBbAIiJFDA3CJdhi/PQMrOECQDMnN33C37DZj4CuNdabXR3BPzE6nhJqn2rRrUTLeGTsccKRv0mKpPsJ90nUOIAZ7jxAaYfwM4R4eIpmu9OvToMGtbU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556810146; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=m98xe487Z3xzlp6OLxCsd9t1xStbP/YAJXwe0aPk1FU=; b=Uxjw6c6Pnoh8e3JJB7yOssgWKet4GmxZsvyoRL/lPOAcZ9Wes0svBA9h7VvI/JjmITdiPiWoN2syfK0VQ91kx+x+JTEMsy+LTwjKcPHKbFqNrH4DzKlcZR0Zb0LHtNRlN/LSGxV286rNnuemwd3IQdZo9sFAmwAJLv2HeZlaNiI= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556810146898696.2572591549731; Thu, 2 May 2019 08:15:46 -0700 (PDT) Received: from localhost ([127.0.0.1]:52901 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMDQw-0008Jf-7f for importer@patchew.org; Thu, 02 May 2019 11:15:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49607) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMD4b-0005Sc-Tp for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMD4a-0002z8-0A for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47676) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMD4Y-0002xN-0d for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:31 -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 D6918307D98B; Thu, 2 May 2019 14:52:27 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 75C147D3F3; Thu, 2 May 2019 14:52:24 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 2 May 2019 16:51:57 +0200 Message-Id: <1556808723-226478-10-git-send-email-imammedo@redhat.com> In-Reply-To: <1556808723-226478-1-git-send-email-imammedo@redhat.com> References: <1556808723-226478-1-git-send-email-imammedo@redhat.com> 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.48]); Thu, 02 May 2019 14:52:28 +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 v4 09/15] tests: acpi: add a way to start tests with UEFI firmware 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: Andrew Jones , Ben Warren , "Michael S. Tsirkin" , Laszlo Ersek , linuxarm@huawei.com, Shameer Kolothum , Shannon Zhao , Gonglei , Wei Yang , xuwei5@huawei.com, xuwei5@hisilicon.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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" For testcase to use UEFI firmware, one needs to provide and specify firmware and varstore blob names in test_data { uefi_fl1, uefi_fl2 } fields respectively and RAM start address plus size where to look for test structure signature. Additionally testcase should specify bootable cdrom image from uefi-boot-images with EFI test utility. Signed-off-by: Igor Mammedov Reviewed-by: Laszlo Ersek --- v4: * fixup commit message (typo/spelling) (Wei Yang ) * get rid of test_acpi_rsdp_address() v3: * drop data_dir prefix and firmware will come from pc-bios directly * add cdrom option so test could use it for providing boot cdrom image * add TODO comment convert '-drive if=3Dpflash' to new syntax (Laszlo) v2: * move RAM start address and size to test_data, as it could differ between boards (and even versions) dfd --- tests/bios-tables-test.c | 52 ++++++++++++++++++++++++++++++++------------= ---- 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 4d13a3c..84e1ce2 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -26,6 +26,11 @@ typedef struct { const char *machine; const char *variant; + const char *uefi_fl1; + const char *uefi_fl2; + const char *cd; + const uint64_t ram_start; + const uint64_t scan_len; uint64_t rsdp_addr; uint8_t rsdp_table[36 /* ACPI 2.0+ RSDP size */]; GArray *tables; @@ -77,13 +82,6 @@ static void free_test_data(test_data *data) g_array_free(data->tables, true); } =20 -static void test_acpi_rsdp_address(test_data *data) -{ - uint32_t off =3D acpi_find_rsdp_address(data->qts); - g_assert_cmphex(off, <, 0x100000); - data->rsdp_addr =3D off; -} - static void test_acpi_rsdp_table(test_data *data) { uint8_t *rsdp_table =3D data->rsdp_table; @@ -524,21 +522,41 @@ static void test_smbios_structs(test_data *data) static void test_acpi_one(const char *params, test_data *data) { char *args; - - /* Disable kernel irqchip to be able to override apic irq0. */ - args =3D g_strdup_printf("-machine %s,accel=3D%s,kernel-irqchip=3Doff " - "-net none -display none %s " - "-drive id=3Dhd0,if=3Dnone,file=3D%s,format=3Dr= aw " - "-device ide-hd,drive=3Dhd0 ", - data->machine, "kvm:tcg", - params ? params : "", disk); + bool use_uefi =3D data->uefi_fl1 && data->uefi_fl2; + + if (use_uefi) { + /* + * TODO: convert '-drive if=3Dpflash' to new syntax (see e33763be7= cd3) + * when arm/virt boad starts to support it. + */ + args =3D g_strdup_printf("-machine %s,accel=3D%s -nodefaults -nogr= aphic " + "-drive if=3Dpflash,format=3Draw,file=3D%s,readonly " + "-drive if=3Dpflash,format=3Draw,file=3D%s,snapshot=3Don -cdro= m %s %s", + data->machine, "kvm:tcg", data->uefi_fl1, data->uefi_fl2, + data->cd, params ? params : ""); + + } else { + /* Disable kernel irqchip to be able to override apic irq0. */ + args =3D g_strdup_printf("-machine %s,accel=3D%s,kernel-irqchip=3D= off " + "-net none -display none %s " + "-drive id=3Dhd0,if=3Dnone,file=3D%s,format=3Draw " + "-device ide-hd,drive=3Dhd0 ", + data->machine, "kvm:tcg", params ? params : "", disk); + } =20 data->qts =3D qtest_init(args); =20 - boot_sector_test(data->qts); + if (use_uefi) { + g_assert(data->scan_len); + data->rsdp_addr =3D acpi_find_rsdp_address_uefi(data->qts, + data->ram_start, data->scan_len); + } else { + boot_sector_test(data->qts); + data->rsdp_addr =3D acpi_find_rsdp_address(data->qts); + g_assert_cmphex(data->rsdp_addr, <, 0x100000); + } =20 data->tables =3D g_array_new(false, true, sizeof(AcpiSdtTable)); - test_acpi_rsdp_address(data); test_acpi_rsdp_table(data); test_acpi_rxsdt_table(data); test_acpi_fadt_table(data); --=20 2.7.4