From nobody Sun Dec 29 18:19:45 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1720047060; cv=none; d=zohomail.com; s=zohoarc; b=cyylL6g3WfxT7cKXB/nNTZzMzkWeaqgU5W4VYQK/cArY1H1jmWuD5MgdhmUulgMazqjro7LjkAdAZ5HUhdCtZurzmu+bcNr7Nfx3ZajfO4LdHsYn5v8o8A3sGYvkkOaRA1myTGDBkXkJ+m2YLCGfSSGaukzZlBOlLilDwRLeCQA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1720047060; h=Content-Type: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=H0Zx9hcjCb8TTX+fknLAFuiiboZn7NyIn2VBiJnNZQk=; b=ZAC2UJkJpQdUQs4Os/7dS5T5DPEme35ZmmaNkN4p8hfxANOIgR7CPOa/Sc/HCcLio2dlQPRL4X4AftdGczh9UD5crSKbGcwSxtLuKgyuRNywv1XuBeurmC8TYYhvCOhGW+v+uBRQ6wS4PcVrGwzRm0x+oq8feeaVxGqpNFddR/Q= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1720047060173454.0725038678647; Wed, 3 Jul 2024 15:51:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sP8nJ-00071q-GV; Wed, 03 Jul 2024 18:49:45 -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 1sP8nI-0006ss-7V for qemu-devel@nongnu.org; Wed, 03 Jul 2024 18:49:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sP8n6-00070X-Tb for qemu-devel@nongnu.org; Wed, 03 Jul 2024 18:49:43 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-618-oWlJxF-QNiO9cApJStP49A-1; Wed, 03 Jul 2024 18:49:29 -0400 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3678f403afaso45147f8f.0 for ; Wed, 03 Jul 2024 15:49:29 -0700 (PDT) Received: from redhat.com ([2a0d:6fc7:441:91a8:a47d:5a9:c02f:92f2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3678fefc01dsm3614889f8f.26.2024.07.03.15.49.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 15:49:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1720046972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=H0Zx9hcjCb8TTX+fknLAFuiiboZn7NyIn2VBiJnNZQk=; b=VM0MAfFVGW2BXCHzp/faGQO2tsFj0ogvcBqNneOzyM0n07F00EstmN9EwqhM2J8SJuy10o hJJBCc/s9SkIabXwbF89gdA33OpFMTNxGVQ9TR8ViMLSi+BYYk5mRBranpESlhWaFg61wf 9VJOLej5MD2S1CBxw37eqCO32FvZHT4= X-MC-Unique: oWlJxF-QNiO9cApJStP49A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720046968; x=1720651768; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=H0Zx9hcjCb8TTX+fknLAFuiiboZn7NyIn2VBiJnNZQk=; b=jVFfQE1gMizsFtCmgAP9MQW68Q2ZZT/vN7/HWZ0JVC/a+u45it9lxP0fHrTagQMR2S BXX2oMvAfcrcy7007gF6bMQL0NmojzcKJZ/JoXTLuF6gnUjLfftyOs9FTrg9g4x+p+Xd RfKeIeW0Q4r7rSSwn6rqaudQPtJRAVIVIrOGtByIt2EYYTO5w/BAlGMCPCjU0O8i+TpF vZro7zDpLIR0VlrdWM+p/K+DaiwTstfyb4GMGbTit6l++QcjRoIc7BOZcPwvyj2TqlRc 4UdRfEXAJGdIuSEF9zSD4OZFnb5MfNU/j/5rN2k0lewYawu6EwKdkjatarXO+IXdxqkF FZJQ== X-Gm-Message-State: AOJu0Yzwd8r9XAa2bts8y/sNTeKqjDNic4wtUrJZaE75be8eus7JGrXw +nKL9bMg1bXqjtU95aj5N5SvKWwS2NP4CGpX2hpL8rhnXESWgCN2dVfddRc/T5/AKicQ06W2W3t XalSnRtZnnBXwA+BVQ0IaAZv+k5MtnNZOT7PUXvp8du2kiSb6Vj4p08LpzmNnsdi4PByJT/vjO8 hUSHYk+Mfa012yjzpffSQnos6YIZNvQg== X-Received: by 2002:a5d:680b:0:b0:367:9801:9c5b with SMTP id ffacd0b85a97d-3679dd67bbfmr5824f8f.50.1720046967888; Wed, 03 Jul 2024 15:49:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHHQUIKbVgMSXeKuVxtELqP5V/h+UXoApWANU5a/GwchrI2Dm0aUGXRESjDruHud9UvF2xwpg== X-Received: by 2002:a5d:680b:0:b0:367:9801:9c5b with SMTP id ffacd0b85a97d-3679dd67bbfmr5812f8f.50.1720046967138; Wed, 03 Jul 2024 15:49:27 -0700 (PDT) Date: Wed, 3 Jul 2024 18:49:22 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Sunil V L , Igor Mammedov , Ani Sinha Subject: [PULL v3 66/85] tests/qtest/bios-tables-test.c: Set "arch" for x86 tests Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent 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=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 @redhat.com) X-ZM-MESSAGEID: 1720047060989100005 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Sunil V L 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 Message-Id: <20240625150839.1358279-9-sunilvl@ventanamicro.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- 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 MST