From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:33917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjR25-0001gP-Le for qemu-devel@nongnu.org; Tue, 15 Jan 2019 10:53:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gjR22-0006Tp-W3 for qemu-devel@nongnu.org; Tue, 15 Jan 2019 10:53:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58906) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gjR22-0006ST-LI for qemu-devel@nongnu.org; Tue, 15 Jan 2019 10:53:38 -0500 From: Igor Mammedov Date: Tue, 15 Jan 2019 16:41:00 +0100 Message-Id: <1547566866-129386-9-git-send-email-imammedo@redhat.com> In-Reply-To: <1547566866-129386-1-git-send-email-imammedo@redhat.com> References: <1547566866-129386-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 08/14] tests: acpi: introduce an abilty start tests with UEFI firmware List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gonglei , Laszlo Ersek , Shannon Zhao , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Samuel Ortiz , Andrew Jones For testcase to use UEFI firmware, one needs to provide and specify firmware and varstore blobs names in test_data { uefi_fl1, uefi_fl2) } fields respectively. Signed-off-by: Igor Mammedov --- tests/bios-tables-test.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 8887319..d290dd2 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -26,6 +26,8 @@ typedef struct { const char *machine; const char *variant; + const char *uefi_fl1; + const char *uefi_fl2; uint64_t rsdp_addr; uint8_t rsdp_table[36 /* ACPI 2.0+ RSDP size */]; GArray *tables; @@ -519,21 +521,35 @@ 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 = g_strdup_printf("-machine %s,accel=%s,kernel-irqchip=off " - "-net none -display none %s " - "-drive id=hd0,if=none,file=%s,format=raw " - "-device ide-hd,drive=hd0 ", - data->machine, "kvm:tcg", - params ? params : "", disk); + bool use_uefi = data->uefi_fl1 && data->uefi_fl2; + + if (use_uefi) { + args = g_strdup_printf("-machine %s,accel=%s -nodefaults -nographic " + "-drive if=pflash,format=raw,file=%s/%s,readonly " + "-drive if=pflash,format=raw,file=%s/%s,snapshot=on %s", + data->machine, "kvm:tcg", data_dir, data->uefi_fl1, data_dir, + data->uefi_fl2, params ? params : ""); + + } else { + /* Disable kernel irqchip to be able to override apic irq0. */ + args = g_strdup_printf("-machine %s,accel=%s,kernel-irqchip=off " + "-net none -display none %s " + "-drive id=hd0,if=none,file=%s,format=raw " + "-device ide-hd,drive=hd0 ", + data->machine, "kvm:tcg", params ? params : "", disk); + } data->qts = qtest_init(args); - boot_sector_test(data->qts); + if (use_uefi) { + data->rsdp_addr = uefi_find_rsdp_addr(data->qts, + 0x40000000ULL, 128ULL * 1024 * 1024); + } else { + boot_sector_test(data->qts); + test_acpi_rsdp_address(data); + } data->tables = 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); -- 2.7.4