From nobody Mon Nov 10 12:47:43 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=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=1556170860; cv=none; d=zoho.com; s=zohoarc; b=lw5zF+qOGL4inUrmkaYXKPDgiJqK9NovtZcjMIm37kyqyGZkb4Z2vGuftAdfHECtGqOdr4zGZBTfL64Z8HVo0Nq/JYn5iL4ep8Mjlu0nXnmJHVwVfgKr801QiNU8FBugzbEJT8pCjMl2TzGmO4WLDcmBli0ELUBMGW47zRixhe8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556170860; 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=nb81Zx+wflvGDtVWIe5ED6YOGoltOz6UxxIA8v6TvbA=; b=EymnNMap4qAFsonx8TkPRxORgJoMoWa4G24AwQl9iu6VO2GjFKjlE5FcUq4xoBwqQlyErBkO2URebXPZU0dQOthxbSHomXp56PhxkcrHxj/lYpAEkihPhLkpWWpzIpNwfNScuMft/qXCYj2TsGXQqrhhEqDmL/7mLmVKPZ+JtIk= 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 1556170860540625.8981825255548; Wed, 24 Apr 2019 22:41:00 -0700 (PDT) Received: from localhost ([127.0.0.1]:52085 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJX7z-0007Z8-IT for importer@patchew.org; Thu, 25 Apr 2019 01:40:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47203) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJX3L-0003hD-7V for qemu-devel@nongnu.org; Thu, 25 Apr 2019 01:36:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJX28-000086-Qh for qemu-devel@nongnu.org; Thu, 25 Apr 2019 01:34:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58602) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hJX28-000071-JH for qemu-devel@nongnu.org; Thu, 25 Apr 2019 01:34:56 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CF8FAC057E3C; Thu, 25 Apr 2019 05:34:55 +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 D838119491; Thu, 25 Apr 2019 05:34:53 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 25 Apr 2019 07:34:44 +0200 Message-Id: <1556170489-131927-9-git-send-email-imammedo@redhat.com> In-Reply-To: <1556170489-131927-1-git-send-email-imammedo@redhat.com> References: <1556170489-131927-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 25 Apr 2019 05:34:55 +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 v3 08/13] 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 , Shameer Kolothum , Shannon Zhao , Gonglei , Wei Yang , =?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 firmwarei and varstore blobs 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 uefi-boot-images EFI test utility. Signed-off-by: Igor Mammedov Reviewed-by: Laszlo Ersek --- 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) --- tests/bios-tables-test.c | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 5790ee4..0f24540 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; @@ -522,21 +527,40 @@ 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); + test_acpi_rsdp_address(data); + } =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