From nobody Thu Sep 19 00:15:35 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1719328315; cv=none; d=zohomail.com; s=zohoarc; b=FbrJRQv/CFU03ckGBJF+Bqal24ZdGhI4D2M7ZJZ45M5WcfW+e+M41p1vqwRrwu2iPaY6/hdE7pRrlA8v+rpocjGzE48GG8DNSjmGtSJuThLn+mIyHzc6OmIeVSodF/PUgL4YKUEiLTQFvAjFQJejuH9Wc6KAq96PcnIARez2DFw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1719328315; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5x3v0wqva9TVVHRhIBzBr8RMwpz9nYE0FP94RF1ae+w=; b=TJ2lOvsvybr+Xsl1Mr3KIRWU6KT9NAq34GXiUbLkODZyDHxLHlcemGWTSAcwkCefUmOhBjHxT4nL0IHbcir2AH4xfe9zKYZ76AiqRviB24qqVe40L6fzNNEUWAzs5te2L9onqs2z9x5KeWLSxfwWNEE8Dix8w+b7Z5wTmOZ13n8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1719328315109162.24216238001156; Tue, 25 Jun 2024 08:11:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sM7nm-0001lj-OK; Tue, 25 Jun 2024 11:09:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sM7nj-0001ju-7N for qemu-devel@nongnu.org; Tue, 25 Jun 2024 11:09:43 -0400 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sM7nf-0006Y0-41 for qemu-devel@nongnu.org; Tue, 25 Jun 2024 11:09:42 -0400 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-7066c9741fbso3076459b3a.2 for ; Tue, 25 Jun 2024 08:09:38 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.187.237]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70681722219sm4142636b3a.73.2024.06.25.08.09.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jun 2024 08:09:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1719328176; x=1719932976; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5x3v0wqva9TVVHRhIBzBr8RMwpz9nYE0FP94RF1ae+w=; b=H9wLXmAXcsr0hIdhPZK7crcfeaR8cu/FNxIzSbCybRSUANideIr3xAJPilD7sIfA+g oTt7LSQRPfjf47aox3dnTxzeX+69Pa0eqpSfT0MrFtICwR1R93WP0DCUnfj+U20JYQgT hc0jH7tec/BRB8T1x0ezel+Zk0aL3LLTKscTpKP11Q8f1HSwsnSZL+2wlJbZrzQnqQAO FEyrMo5sqfU4yAP9FKXQhjbpMsnLNaD54ErHPmxm81WNXi01iZlOn41ukRSbJcKUUrIz FbTF/1gdN/swdwjHToskgZwP8YTJvw+fleJ1TsXG3EitAPF6WzYv/WP0coZJFsnmNHqm LDGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719328176; x=1719932976; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5x3v0wqva9TVVHRhIBzBr8RMwpz9nYE0FP94RF1ae+w=; b=Dgc9M7Mcuomn1oWKI4XVPQyUAlFPcyW2jE73YjiAIw6b5meWoAPqjjzxhFXi3HLtyk yBeGrnplglK10719LXHW5N09Tf3v5Fvfi/2hIeeiDYaPFUDWrzgmVSKxlK/4eP+CXYlB RCFC84smXcenGzVrfb1CFCFiRk7wvpd1bzWHhokAlajlGz3oGHc49a2hMVjP32OJvjsm jzsuWbbSJX8ABGJVmIIhWj+KwWthnlF6e0aMIBffzbk1rlZUgKchNyeN4TRusP+kSrFH t1/+HX+qHPJdZYaW0QyEkiiVS+xkklvcaZYHZL+dB0yhgTxee4xoyb9fHBLCb4AHBk4m trfw== X-Gm-Message-State: AOJu0Yx6QiEbzoIr1c2Ke0ajLB8dCxDVmiyfTxp/B9i5nyJSzNEAMRjO u9kzIe5zRoMiHOqGcvuQRjF5xN+eTCx7qOLI0Yt4t5y5vWziiz1iGKzCCNItUp0NAjkpJh6B4AJ 8 X-Google-Smtp-Source: AGHT+IEbjcXJUERm852HFqJliii21O33ROkRnF5p70RWs27yrAj5g5o6Tt3yK6b6Py3DB3jjFmxn8A== X-Received: by 2002:a05:6a00:b91:b0:705:b81b:6ee2 with SMTP id d2e1a72fcca58-706745e809bmr11391818b3a.19.1719328176469; Tue, 25 Jun 2024 08:09:36 -0700 (PDT) From: Sunil V L To: qemu-devel@nongnu.org, qemu-arm@nongnu.org, qemu-riscv@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Laurent Vivier , Gerd Hoffmann , Sia Jee Heng , Alistair Francis , Daniel Henrique Barboza , Palmer Dabbelt , Bin Meng , Weiwei Li , Liu Zhiwei , Sunil V L Subject: [PATCH v4 08/16] tests/qtest/bios-tables-test.c: Set "arch" for x86 tests Date: Tue, 25 Jun 2024 20:38:31 +0530 Message-Id: <20240625150839.1358279-9-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240625150839.1358279-1-sunilvl@ventanamicro.com> References: <20240625150839.1358279-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42b; envelope-from=sunilvl@ventanamicro.com; helo=mail-pf1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1719328316809100003 Content-Type: text/plain; charset="utf-8" To search for expected AML files under ${arch}/${machine} path, set this field for X86 related test cases. Signed-off-by: Sunil V L Reviewed-by: Igor Mammedov --- tests/qtest/bios-tables-test.c | 77 ++++++++++++++++++++++++++++------ 1 file changed, 64 insertions(+), 13 deletions(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 007c281c9a..f4c4704bab 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -933,6 +933,7 @@ static void test_acpi_piix4_tcg(void) * This is to make guest actually run. */ data.machine =3D MACHINE_PC; + data.arch =3D "x86"; data.required_struct_types =3D base_required_struct_types; data.required_struct_types_len =3D ARRAY_SIZE(base_required_struct_typ= es); test_acpi_one(NULL, &data); @@ -944,6 +945,7 @@ static void test_acpi_piix4_tcg_bridge(void) test_data data =3D {}; =20 data.machine =3D MACHINE_PC; + data.arch =3D "x86"; data.variant =3D ".bridge"; data.required_struct_types =3D base_required_struct_types; data.required_struct_types_len =3D ARRAY_SIZE(base_required_struct_typ= es); @@ -981,6 +983,7 @@ static void test_acpi_piix4_no_root_hotplug(void) test_data data =3D {}; =20 data.machine =3D MACHINE_PC; + data.arch =3D "x86"; data.variant =3D ".roothp"; data.required_struct_types =3D base_required_struct_types; data.required_struct_types_len =3D ARRAY_SIZE(base_required_struct_typ= es); @@ -997,6 +1000,7 @@ static void test_acpi_piix4_no_bridge_hotplug(void) test_data data =3D {}; =20 data.machine =3D MACHINE_PC; + data.arch =3D "x86"; data.variant =3D ".hpbridge"; data.required_struct_types =3D base_required_struct_types; data.required_struct_types_len =3D ARRAY_SIZE(base_required_struct_typ= es); @@ -1013,6 +1017,7 @@ static void test_acpi_piix4_no_acpi_pci_hotplug(void) test_data data =3D {}; =20 data.machine =3D MACHINE_PC; + data.arch =3D "x86"; data.variant =3D ".hpbrroot"; data.required_struct_types =3D base_required_struct_types; data.required_struct_types_len =3D ARRAY_SIZE(base_required_struct_typ= es); @@ -1034,6 +1039,7 @@ static void test_acpi_q35_tcg(void) test_data data =3D {}; =20 data.machine =3D MACHINE_Q35; + data.arch =3D "x86"; data.required_struct_types =3D base_required_struct_types; data.required_struct_types_len =3D ARRAY_SIZE(base_required_struct_typ= es); test_acpi_one(NULL, &data); @@ -1049,6 +1055,7 @@ static void test_acpi_q35_kvm_type4_count(void) { test_data data =3D { .machine =3D MACHINE_Q35, + .arch =3D "x86", .variant =3D ".type4-count", .required_struct_types =3D base_required_struct_types, .required_struct_types_len =3D ARRAY_SIZE(base_required_struct_typ= es), @@ -1065,6 +1072,7 @@ static void test_acpi_q35_kvm_core_count(void) { test_data data =3D { .machine =3D MACHINE_Q35, + .arch =3D "x86", .variant =3D ".core-count", .required_struct_types =3D base_required_struct_types, .required_struct_types_len =3D ARRAY_SIZE(base_required_struct_typ= es), @@ -1082,6 +1090,7 @@ static void test_acpi_q35_kvm_core_count2(void) { test_data data =3D { .machine =3D MACHINE_Q35, + .arch =3D "x86", .variant =3D ".core-count2", .required_struct_types =3D base_required_struct_types, .required_struct_types_len =3D ARRAY_SIZE(base_required_struct_typ= es), @@ -1099,6 +1108,7 @@ static void test_acpi_q35_kvm_thread_count(void) { test_data data =3D { .machine =3D MACHINE_Q35, + .arch =3D "x86", .variant =3D ".thread-count", .required_struct_types =3D base_required_struct_types, .required_struct_types_len =3D ARRAY_SIZE(base_required_struct_typ= es), @@ -1116,6 +1126,7 @@ static void test_acpi_q35_kvm_thread_count2(void) { test_data data =3D { .machine =3D MACHINE_Q35, + .arch =3D "x86", .variant =3D ".thread-count2", .required_struct_types =3D base_required_struct_types, .required_struct_types_len =3D ARRAY_SIZE(base_required_struct_typ= es), @@ -1134,6 +1145,7 @@ static void test_acpi_q35_tcg_bridge(void) test_data data =3D {}; =20 data.machine =3D MACHINE_Q35; + data.arch =3D "x86", data.variant =3D ".bridge"; data.required_struct_types =3D base_required_struct_types; data.required_struct_types_len =3D ARRAY_SIZE(base_required_struct_typ= es); @@ -1148,6 +1160,7 @@ static void test_acpi_q35_tcg_no_acpi_hotplug(void) test_data data =3D {}; =20 data.machine =3D MACHINE_Q35; + data.arch =3D "x86", data.variant =3D ".noacpihp"; data.required_struct_types =3D base_required_struct_types; data.required_struct_types_len =3D ARRAY_SIZE(base_required_struct_typ= es); @@ -1176,6 +1189,7 @@ static void test_acpi_q35_multif_bridge(void) { test_data data =3D { .machine =3D MACHINE_Q35, + .arch =3D "x86", .variant =3D ".multi-bridge", }; test_vm_prepare("-S" @@ -1225,6 +1239,7 @@ static void test_acpi_q35_tcg_mmio64(void) { test_data data =3D { .machine =3D MACHINE_Q35, + .arch =3D "x86", .variant =3D ".mmio64", .tcg_only =3D true, .required_struct_types =3D base_required_struct_types, @@ -1245,6 +1260,7 @@ static void test_acpi_piix4_tcg_cphp(void) test_data data =3D {}; =20 data.machine =3D MACHINE_PC; + data.arch =3D "x86"; data.variant =3D ".cphp"; test_acpi_one("-smp 2,cores=3D3,sockets=3D2,maxcpus=3D6" " -object memory-backend-ram,id=3Dram0,size=3D64M" @@ -1260,6 +1276,7 @@ static void test_acpi_q35_tcg_cphp(void) test_data data =3D {}; =20 data.machine =3D MACHINE_Q35; + data.arch =3D "x86", data.variant =3D ".cphp"; test_acpi_one(" -smp 2,cores=3D3,sockets=3D2,maxcpus=3D6" " -object memory-backend-ram,id=3Dram0,size=3D64M" @@ -1279,6 +1296,7 @@ static void test_acpi_q35_tcg_ipmi(void) test_data data =3D {}; =20 data.machine =3D MACHINE_Q35; + data.arch =3D "x86", data.variant =3D ".ipmibt"; data.required_struct_types =3D ipmi_required_struct_types; data.required_struct_types_len =3D ARRAY_SIZE(ipmi_required_struct_typ= es); @@ -1293,6 +1311,7 @@ static void test_acpi_q35_tcg_smbus_ipmi(void) test_data data =3D {}; =20 data.machine =3D MACHINE_Q35; + data.arch =3D "x86", data.variant =3D ".ipmismbus"; data.required_struct_types =3D ipmi_required_struct_types; data.required_struct_types_len =3D ARRAY_SIZE(ipmi_required_struct_typ= es); @@ -1310,6 +1329,7 @@ static void test_acpi_piix4_tcg_ipmi(void) * This is to make guest actually run. */ data.machine =3D MACHINE_PC; + data.arch =3D "x86"; data.variant =3D ".ipmikcs"; data.required_struct_types =3D ipmi_required_struct_types; data.required_struct_types_len =3D ARRAY_SIZE(ipmi_required_struct_typ= es); @@ -1324,6 +1344,7 @@ static void test_acpi_q35_tcg_memhp(void) test_data data =3D {}; =20 data.machine =3D MACHINE_Q35; + data.arch =3D "x86", data.variant =3D ".memhp"; test_acpi_one(" -m 128,slots=3D3,maxmem=3D1G" " -object memory-backend-ram,id=3Dram0,size=3D64M" @@ -1339,6 +1360,7 @@ static void test_acpi_piix4_tcg_memhp(void) test_data data =3D {}; =20 data.machine =3D MACHINE_PC; + data.arch =3D "x86"; data.variant =3D ".memhp"; test_acpi_one(" -m 128,slots=3D3,maxmem=3D1G" " -object memory-backend-ram,id=3Dram0,size=3D64M" @@ -1354,6 +1376,7 @@ static void test_acpi_piix4_tcg_nosmm(void) test_data data =3D {}; =20 data.machine =3D MACHINE_PC; + data.arch =3D "x86"; data.variant =3D ".nosmm"; test_acpi_one("-machine smm=3Doff", &data); free_test_data(&data); @@ -1364,6 +1387,7 @@ static void test_acpi_piix4_tcg_smm_compat(void) test_data data =3D {}; =20 data.machine =3D MACHINE_PC; + data.arch =3D "x86"; data.variant =3D ".smm-compat"; test_acpi_one("-global PIIX4_PM.smm-compat=3Don", &data); free_test_data(&data); @@ -1374,6 +1398,7 @@ static void test_acpi_piix4_tcg_smm_compat_nosmm(void) test_data data =3D {}; =20 data.machine =3D MACHINE_PC; + data.arch =3D "x86"; data.variant =3D ".smm-compat-nosmm"; test_acpi_one("-global PIIX4_PM.smm-compat=3Don -machine smm=3Doff", &= data); free_test_data(&data); @@ -1384,6 +1409,7 @@ static void test_acpi_piix4_tcg_nohpet(void) test_data data =3D {}; =20 data.machine =3D MACHINE_PC; + data.arch =3D "x86"; data.machine_param =3D ",hpet=3Doff"; data.variant =3D ".nohpet"; test_acpi_one(NULL, &data); @@ -1395,6 +1421,7 @@ static void test_acpi_q35_tcg_numamem(void) test_data data =3D {}; =20 data.machine =3D MACHINE_Q35; + data.arch =3D "x86", data.variant =3D ".numamem"; test_acpi_one(" -object memory-backend-ram,id=3Dram0,size=3D128M" " -numa node -numa node,memdev=3Dram0", &data); @@ -1406,6 +1433,7 @@ static void test_acpi_q35_kvm_xapic(void) test_data data =3D {}; =20 data.machine =3D MACHINE_Q35; + data.arch =3D "x86", data.variant =3D ".xapic"; test_acpi_one(" -object memory-backend-ram,id=3Dram0,size=3D128M" " -numa node -numa node,memdev=3Dram0" @@ -1418,6 +1446,7 @@ static void test_acpi_q35_tcg_nosmm(void) test_data data =3D {}; =20 data.machine =3D MACHINE_Q35; + data.arch =3D "x86", data.variant =3D ".nosmm"; test_acpi_one("-machine smm=3Doff", &data); free_test_data(&data); @@ -1428,6 +1457,7 @@ static void test_acpi_q35_tcg_smm_compat(void) test_data data =3D {}; =20 data.machine =3D MACHINE_Q35; + data.arch =3D "x86", data.variant =3D ".smm-compat"; test_acpi_one("-global ICH9-LPC.smm-compat=3Don", &data); free_test_data(&data); @@ -1438,6 +1468,7 @@ static void test_acpi_q35_tcg_smm_compat_nosmm(void) test_data data =3D {}; =20 data.machine =3D MACHINE_Q35; + data.arch =3D "x86", data.variant =3D ".smm-compat-nosmm"; test_acpi_one("-global ICH9-LPC.smm-compat=3Don -machine smm=3Doff", &= data); free_test_data(&data); @@ -1448,6 +1479,7 @@ static void test_acpi_q35_tcg_nohpet(void) test_data data =3D {}; =20 data.machine =3D MACHINE_Q35; + data.arch =3D "x86", data.machine_param =3D ",hpet=3Doff"; data.variant =3D ".nohpet"; test_acpi_one(NULL, &data); @@ -1459,6 +1491,7 @@ static void test_acpi_q35_kvm_dmar(void) test_data data =3D {}; =20 data.machine =3D MACHINE_Q35; + data.arch =3D "x86", data.variant =3D ".dmar"; test_acpi_one("-machine kernel-irqchip=3Dsplit -accel kvm" " -device intel-iommu,intremap=3Don,device-iotlb=3Don", = &data); @@ -1470,6 +1503,7 @@ static void test_acpi_q35_tcg_ivrs(void) test_data data =3D {}; =20 data.machine =3D MACHINE_Q35; + data.arch =3D "x86", data.variant =3D ".ivrs"; data.tcg_only =3D true, test_acpi_one(" -device amd-iommu", &data); @@ -1481,6 +1515,7 @@ static void test_acpi_piix4_tcg_numamem(void) test_data data =3D {}; =20 data.machine =3D MACHINE_PC; + data.arch =3D "x86"; data.variant =3D ".numamem"; test_acpi_one(" -object memory-backend-ram,id=3Dram0,size=3D128M" " -numa node -numa node,memdev=3Dram0", &data); @@ -1489,8 +1524,9 @@ static void test_acpi_piix4_tcg_numamem(void) =20 uint64_t tpm_tis_base_addr; =20 -static void test_acpi_tcg_tpm(const char *machine, const char *tpm_if, - uint64_t base, enum TPMVersion tpm_version) +static void test_acpi_tcg_tpm(const char *machine, const char *arch, + const char *tpm_if, uint64_t base, + enum TPMVersion tpm_version) { gchar *tmp_dir_name =3D g_strdup_printf("qemu-test_acpi_%s_tcg_%s.XXXX= XX", machine, tpm_if); @@ -1517,6 +1553,7 @@ static void test_acpi_tcg_tpm(const char *machine, co= nst char *tpm_if, tpm_emu_test_wait_cond(&test); =20 data.machine =3D machine; + data.arch =3D arch; data.variant =3D variant; =20 args =3D g_strdup_printf( @@ -1540,19 +1577,20 @@ static void test_acpi_tcg_tpm(const char *machine, = const char *tpm_if, =20 static void test_acpi_q35_tcg_tpm2_tis(void) { - test_acpi_tcg_tpm("q35", "tis", 0xFED40000, TPM_VERSION_2_0); + test_acpi_tcg_tpm("q35", "x86", "tis", 0xFED40000, TPM_VERSION_2_0); } =20 static void test_acpi_q35_tcg_tpm12_tis(void) { - test_acpi_tcg_tpm("q35", "tis", 0xFED40000, TPM_VERSION_1_2); + test_acpi_tcg_tpm("q35", "x86", "tis", 0xFED40000, TPM_VERSION_1_2); } =20 -static void test_acpi_tcg_dimm_pxm(const char *machine) +static void test_acpi_tcg_dimm_pxm(const char *machine, const char *arch) { test_data data =3D {}; =20 data.machine =3D machine; + data.arch =3D arch; data.variant =3D ".dimmpxm"; test_acpi_one(" -machine nvdimm=3Don,nvdimm-persistence=3Dcpu" " -smp 4,sockets=3D4" @@ -1579,12 +1617,12 @@ static void test_acpi_tcg_dimm_pxm(const char *mach= ine) =20 static void test_acpi_q35_tcg_dimm_pxm(void) { - test_acpi_tcg_dimm_pxm(MACHINE_Q35); + test_acpi_tcg_dimm_pxm(MACHINE_Q35, "x86"); } =20 static void test_acpi_piix4_tcg_dimm_pxm(void) { - test_acpi_tcg_dimm_pxm(MACHINE_PC); + test_acpi_tcg_dimm_pxm(MACHINE_PC, "x86"); } =20 static void test_acpi_aarch64_virt_tcg_memhp(void) @@ -1621,6 +1659,7 @@ static void test_acpi_aarch64_virt_tcg_memhp(void) static void test_acpi_microvm_prepare(test_data *data) { data->machine =3D "microvm"; + data->arch =3D "x86"; data->required_struct_types =3D NULL; /* no smbios */ data->required_struct_types_len =3D 0; data->blkdev =3D "virtio-blk-device"; @@ -1737,11 +1776,12 @@ static void test_acpi_aarch64_virt_tcg_pxb(void) free_test_data(&data); } =20 -static void test_acpi_tcg_acpi_hmat(const char *machine) +static void test_acpi_tcg_acpi_hmat(const char *machine, const char *arch) { test_data data =3D {}; =20 data.machine =3D machine; + data.arch =3D arch; data.variant =3D ".acpihmat"; test_acpi_one(" -machine hmat=3Don" " -smp 2,sockets=3D2" @@ -1770,12 +1810,12 @@ static void test_acpi_tcg_acpi_hmat(const char *mac= hine) =20 static void test_acpi_q35_tcg_acpi_hmat(void) { - test_acpi_tcg_acpi_hmat(MACHINE_Q35); + test_acpi_tcg_acpi_hmat(MACHINE_Q35, "x86"); } =20 static void test_acpi_piix4_tcg_acpi_hmat(void) { - test_acpi_tcg_acpi_hmat(MACHINE_PC); + test_acpi_tcg_acpi_hmat(MACHINE_PC, "x86"); } =20 static void test_acpi_aarch64_virt_tcg_acpi_hmat(void) @@ -1841,6 +1881,7 @@ static void test_acpi_q35_tcg_acpi_hmat_noinitiator(v= oid) test_data data =3D {}; =20 data.machine =3D MACHINE_Q35; + data.arch =3D "x86"; data.variant =3D ".acpihmat-noinitiator"; test_acpi_one(" -machine hmat=3Don" " -smp 4,sockets=3D2" @@ -1884,13 +1925,14 @@ static void test_acpi_q35_tcg_acpi_hmat_noinitiator= (void) } =20 #ifdef CONFIG_POSIX -static void test_acpi_erst(const char *machine) +static void test_acpi_erst(const char *machine, const char *arch) { gchar *tmp_path =3D g_dir_make_tmp("qemu-test-erst.XXXXXX", NULL); gchar *params; test_data data =3D {}; =20 data.machine =3D machine; + data.arch =3D arch; data.variant =3D ".acpierst"; params =3D g_strdup_printf( " -object memory-backend-file,id=3Derstnvram," @@ -1905,12 +1947,12 @@ static void test_acpi_erst(const char *machine) =20 static void test_acpi_piix4_acpi_erst(void) { - test_acpi_erst(MACHINE_PC); + test_acpi_erst(MACHINE_PC, "x86"); } =20 static void test_acpi_q35_acpi_erst(void) { - test_acpi_erst(MACHINE_Q35); + test_acpi_erst(MACHINE_Q35, "x86"); } =20 static void test_acpi_microvm_acpi_erst(void) @@ -1978,6 +2020,7 @@ static void test_acpi_q35_viot(void) { test_data data =3D { .machine =3D MACHINE_Q35, + .arch =3D "x86", .variant =3D ".viot", }; =20 @@ -2002,6 +2045,7 @@ static void test_acpi_q35_cxl(void) =20 test_data data =3D { .machine =3D MACHINE_Q35, + .arch =3D "x86", .variant =3D ".cxl", }; /* @@ -2067,6 +2111,7 @@ static void test_acpi_q35_slic(void) { test_data data =3D { .machine =3D MACHINE_Q35, + .arch =3D "x86", .variant =3D ".slic", }; =20 @@ -2081,6 +2126,7 @@ static void test_acpi_q35_applesmc(void) { test_data data =3D { .machine =3D MACHINE_Q35, + .arch =3D "x86", .variant =3D ".applesmc", }; =20 @@ -2094,6 +2140,7 @@ static void test_acpi_q35_pvpanic_isa(void) { test_data data =3D { .machine =3D MACHINE_Q35, + .arch =3D "x86", .variant =3D ".pvpanic-isa", }; =20 @@ -2106,6 +2153,7 @@ static void test_acpi_pc_smbios_options(void) uint8_t req_type11[] =3D { 11 }; test_data data =3D { .machine =3D MACHINE_PC, + .arch =3D "x86", .variant =3D ".pc_smbios_options", .required_struct_types =3D req_type11, .required_struct_types_len =3D ARRAY_SIZE(req_type11), @@ -2120,6 +2168,7 @@ static void test_acpi_pc_smbios_blob(void) uint8_t req_type11[] =3D { 11 }; test_data data =3D { .machine =3D MACHINE_PC, + .arch =3D "x86", .variant =3D ".pc_smbios_blob", .required_struct_types =3D req_type11, .required_struct_types_len =3D ARRAY_SIZE(req_type11), @@ -2169,6 +2218,7 @@ static void test_acpi_piix4_oem_fields(void) test_data data =3D {}; =20 data.machine =3D MACHINE_PC; + data.arch =3D "x86"; data.required_struct_types =3D base_required_struct_types; data.required_struct_types_len =3D ARRAY_SIZE(base_required_struct_typ= es); =20 @@ -2187,6 +2237,7 @@ static void test_acpi_q35_oem_fields(void) test_data data =3D {}; =20 data.machine =3D MACHINE_Q35; + data.arch =3D "x86"; data.required_struct_types =3D base_required_struct_types; data.required_struct_types_len =3D ARRAY_SIZE(base_required_struct_typ= es); =20 --=20 2.40.1