From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6037CC2BBCA for ; Tue, 25 Jun 2024 10:49:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sM3ja-0004s5-8E; Tue, 25 Jun 2024 06:49:10 -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 1sM3jY-0004r5-TH for qemu-devel@nongnu.org; Tue, 25 Jun 2024 06:49:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sM3jW-00067X-CZ for qemu-devel@nongnu.org; Tue, 25 Jun 2024 06:49:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1719312545; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jaa8oVICcAI/QWfOCPkPiCW4kJxfRPkwtBuSVnO9grI=; b=KZRCBrrodzo18iPfoW6rTeQ9FM2QBSr3pk8XQehgvONaZxeHoEhWeICMjErch5j/atETEC jxHyG2fREqQYkZQlI+9VbuxsKDKG45FGyAzgel1SwpkJiOY4jIM0sY5Zf6qOCklMGwaH2J KinhvqOmVP/0AftiqbH4tr7j9JTdSmg= Received: from mail-lj1-f197.google.com (mail-lj1-f197.google.com [209.85.208.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-81-lxWgJWjdOdqg29YvlR7_Sg-1; Tue, 25 Jun 2024 06:49:04 -0400 X-MC-Unique: lxWgJWjdOdqg29YvlR7_Sg-1 Received: by mail-lj1-f197.google.com with SMTP id 38308e7fff4ca-2ec5100480bso28184721fa.0 for ; Tue, 25 Jun 2024 03:49:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719312542; x=1719917342; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jaa8oVICcAI/QWfOCPkPiCW4kJxfRPkwtBuSVnO9grI=; b=bsCj928D9SRQL6ixmGLs8Pfsh0g+nkbUlYC2disvp0RJsvMr5qfXaBUcALL14e/4Vw NUd6w65/nrSwCn5MHmBIG8jxhLw1pMzyn9lCqf/NzLqLovSrcWatgRnDAQWuL+XNi2cu M5tpcngoOKWqaJNlkiwvUlhlvnwe7Hh/bYqEI5A6HexeSQXDpU+WvynFW/NMsoBGQsXo y9v0CzriQkgyl6m4HLzSon/SJwEC+Xb6w+kLJpNxkpsmlRowK/xxELSaEHBmOJnuwXAE K6to/Rw8k8YjBhiI24S4TH8urIbz0p+Z/9XMzap0T/RlQ5Lm7txqdwb8MixTWkzJZ/ju sybw== X-Gm-Message-State: AOJu0YxMd+guVGJhRAOXgc8XKfQbYdWU20paDDHRZMiKLEURNRKfg5A0 s4ZN8QtrExTxSN/ILXwp8kW1oL8Ca4z4xjZObHzSgzZj/6GeM0H1f6t26mtWIp/PVDO30SayJeH nnl5XIUnuO0rUTb24eZdpji+9722aoOdxV3MmvC56qs9rfAzsSscA X-Received: by 2002:a05:6512:10d1:b0:52c:e982:8457 with SMTP id 2adb3069b0e04-52ce9828502mr3671840e87.32.1719312542562; Tue, 25 Jun 2024 03:49:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGPN/QubvwuN1aKq2wd8JSnd5jtHPQQQY/YAD6e/j8abnf1UuXjYvUwzmfvaQU20S6r+p+c3w== X-Received: by 2002:a05:6512:10d1:b0:52c:e982:8457 with SMTP id 2adb3069b0e04-52ce9828502mr3671821e87.32.1719312542037; Tue, 25 Jun 2024 03:49:02 -0700 (PDT) Received: from imammedo.users.ipa.redhat.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42481747c76sm167328465e9.0.2024.06.25.03.49.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jun 2024 03:49:01 -0700 (PDT) Date: Tue, 25 Jun 2024 12:49:00 +0200 From: Igor Mammedov To: Sunil V L Cc: qemu-devel@nongnu.org, qemu-arm@nongnu.org, qemu-riscv@nongnu.org, Paolo Bonzini , =?UTF-8?B?TWFyYy1BbmRyw6k=?= Lureau , "Daniel P . =?UTF-8?B?QmVycmFuZ8Op?=" , Thomas Huth , Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= , "Michael S . Tsirkin" , Ani Sinha , Laurent Vivier , Gerd Hoffmann , Sia Jee Heng , Alistair Francis , Daniel Henrique Barboza , Palmer Dabbelt , Bin Meng , Weiwei Li , Liu Zhiwei Subject: Re: [PATCH v3 07/15] tests/qtest/bios-tables-test.c: Set "arch" for x86 tests Message-ID: <20240625124900.194e7bca@imammedo.users.ipa.redhat.com> In-Reply-To: <20240621115906.1049832-8-sunilvl@ventanamicro.com> References: <20240621115906.1049832-1-sunilvl@ventanamicro.com> <20240621115906.1049832-8-sunilvl@ventanamicro.com> X-Mailer: Claws Mail 4.2.0 (GTK 3.24.42; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.151, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Fri, 21 Jun 2024 17:28:58 +0530 Sunil V L wrote: > 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 = MACHINE_PC; > + data.arch = "x86"; > data.required_struct_types = base_required_struct_types; > data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types); > test_acpi_one(NULL, &data); > @@ -944,6 +945,7 @@ static void test_acpi_piix4_tcg_bridge(void) > test_data data = {}; > > data.machine = MACHINE_PC; > + data.arch = "x86"; > data.variant = ".bridge"; > data.required_struct_types = base_required_struct_types; > data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types); > @@ -981,6 +983,7 @@ static void test_acpi_piix4_no_root_hotplug(void) > test_data data = {}; > > data.machine = MACHINE_PC; > + data.arch = "x86"; > data.variant = ".roothp"; > data.required_struct_types = base_required_struct_types; > data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types); > @@ -997,6 +1000,7 @@ static void test_acpi_piix4_no_bridge_hotplug(void) > test_data data = {}; > > data.machine = MACHINE_PC; > + data.arch = "x86"; > data.variant = ".hpbridge"; > data.required_struct_types = base_required_struct_types; > data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types); > @@ -1013,6 +1017,7 @@ static void test_acpi_piix4_no_acpi_pci_hotplug(void) > test_data data = {}; > > data.machine = MACHINE_PC; > + data.arch = "x86"; > data.variant = ".hpbrroot"; > data.required_struct_types = base_required_struct_types; > data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types); > @@ -1034,6 +1039,7 @@ static void test_acpi_q35_tcg(void) > test_data data = {}; > > data.machine = MACHINE_Q35; > + data.arch = "x86"; > data.required_struct_types = base_required_struct_types; > data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types); > test_acpi_one(NULL, &data); > @@ -1049,6 +1055,7 @@ static void test_acpi_q35_kvm_type4_count(void) > { > test_data data = { > .machine = MACHINE_Q35, > + .arch = "x86", > .variant = ".type4-count", > .required_struct_types = base_required_struct_types, > .required_struct_types_len = ARRAY_SIZE(base_required_struct_types), > @@ -1065,6 +1072,7 @@ static void test_acpi_q35_kvm_core_count(void) > { > test_data data = { > .machine = MACHINE_Q35, > + .arch = "x86", > .variant = ".core-count", > .required_struct_types = base_required_struct_types, > .required_struct_types_len = ARRAY_SIZE(base_required_struct_types), > @@ -1082,6 +1090,7 @@ static void test_acpi_q35_kvm_core_count2(void) > { > test_data data = { > .machine = MACHINE_Q35, > + .arch = "x86", > .variant = ".core-count2", > .required_struct_types = base_required_struct_types, > .required_struct_types_len = ARRAY_SIZE(base_required_struct_types), > @@ -1099,6 +1108,7 @@ static void test_acpi_q35_kvm_thread_count(void) > { > test_data data = { > .machine = MACHINE_Q35, > + .arch = "x86", > .variant = ".thread-count", > .required_struct_types = base_required_struct_types, > .required_struct_types_len = ARRAY_SIZE(base_required_struct_types), > @@ -1116,6 +1126,7 @@ static void test_acpi_q35_kvm_thread_count2(void) > { > test_data data = { > .machine = MACHINE_Q35, > + .arch = "x86", > .variant = ".thread-count2", > .required_struct_types = base_required_struct_types, > .required_struct_types_len = ARRAY_SIZE(base_required_struct_types), > @@ -1134,6 +1145,7 @@ static void test_acpi_q35_tcg_bridge(void) > test_data data = {}; > > data.machine = MACHINE_Q35; > + data.arch = "x86", > data.variant = ".bridge"; > data.required_struct_types = base_required_struct_types; > data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types); > @@ -1148,6 +1160,7 @@ static void test_acpi_q35_tcg_no_acpi_hotplug(void) > test_data data = {}; > > data.machine = MACHINE_Q35; > + data.arch = "x86", > data.variant = ".noacpihp"; > data.required_struct_types = base_required_struct_types; > data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types); > @@ -1176,6 +1189,7 @@ static void test_acpi_q35_multif_bridge(void) > { > test_data data = { > .machine = MACHINE_Q35, > + .arch = "x86", > .variant = ".multi-bridge", > }; > test_vm_prepare("-S" > @@ -1225,6 +1239,7 @@ static void test_acpi_q35_tcg_mmio64(void) > { > test_data data = { > .machine = MACHINE_Q35, > + .arch = "x86", > .variant = ".mmio64", > .tcg_only = true, > .required_struct_types = base_required_struct_types, > @@ -1245,6 +1260,7 @@ static void test_acpi_piix4_tcg_cphp(void) > test_data data = {}; > > data.machine = MACHINE_PC; > + data.arch = "x86"; > data.variant = ".cphp"; > test_acpi_one("-smp 2,cores=3,sockets=2,maxcpus=6" > " -object memory-backend-ram,id=ram0,size=64M" > @@ -1260,6 +1276,7 @@ static void test_acpi_q35_tcg_cphp(void) > test_data data = {}; > > data.machine = MACHINE_Q35; > + data.arch = "x86", > data.variant = ".cphp"; > test_acpi_one(" -smp 2,cores=3,sockets=2,maxcpus=6" > " -object memory-backend-ram,id=ram0,size=64M" > @@ -1279,6 +1296,7 @@ static void test_acpi_q35_tcg_ipmi(void) > test_data data = {}; > > data.machine = MACHINE_Q35; > + data.arch = "x86", > data.variant = ".ipmibt"; > data.required_struct_types = ipmi_required_struct_types; > data.required_struct_types_len = ARRAY_SIZE(ipmi_required_struct_types); > @@ -1293,6 +1311,7 @@ static void test_acpi_q35_tcg_smbus_ipmi(void) > test_data data = {}; > > data.machine = MACHINE_Q35; > + data.arch = "x86", > data.variant = ".ipmismbus"; > data.required_struct_types = ipmi_required_struct_types; > data.required_struct_types_len = ARRAY_SIZE(ipmi_required_struct_types); > @@ -1310,6 +1329,7 @@ static void test_acpi_piix4_tcg_ipmi(void) > * This is to make guest actually run. > */ > data.machine = MACHINE_PC; > + data.arch = "x86"; > data.variant = ".ipmikcs"; > data.required_struct_types = ipmi_required_struct_types; > data.required_struct_types_len = ARRAY_SIZE(ipmi_required_struct_types); > @@ -1324,6 +1344,7 @@ static void test_acpi_q35_tcg_memhp(void) > test_data data = {}; > > data.machine = MACHINE_Q35; > + data.arch = "x86", > data.variant = ".memhp"; > test_acpi_one(" -m 128,slots=3,maxmem=1G" > " -object memory-backend-ram,id=ram0,size=64M" > @@ -1339,6 +1360,7 @@ static void test_acpi_piix4_tcg_memhp(void) > test_data data = {}; > > data.machine = MACHINE_PC; > + data.arch = "x86"; > data.variant = ".memhp"; > test_acpi_one(" -m 128,slots=3,maxmem=1G" > " -object memory-backend-ram,id=ram0,size=64M" > @@ -1354,6 +1376,7 @@ static void test_acpi_piix4_tcg_nosmm(void) > test_data data = {}; > > data.machine = MACHINE_PC; > + data.arch = "x86"; > data.variant = ".nosmm"; > test_acpi_one("-machine smm=off", &data); > free_test_data(&data); > @@ -1364,6 +1387,7 @@ static void test_acpi_piix4_tcg_smm_compat(void) > test_data data = {}; > > data.machine = MACHINE_PC; > + data.arch = "x86"; > data.variant = ".smm-compat"; > test_acpi_one("-global PIIX4_PM.smm-compat=on", &data); > free_test_data(&data); > @@ -1374,6 +1398,7 @@ static void test_acpi_piix4_tcg_smm_compat_nosmm(void) > test_data data = {}; > > data.machine = MACHINE_PC; > + data.arch = "x86"; > data.variant = ".smm-compat-nosmm"; > test_acpi_one("-global PIIX4_PM.smm-compat=on -machine smm=off", &data); > free_test_data(&data); > @@ -1384,6 +1409,7 @@ static void test_acpi_piix4_tcg_nohpet(void) > test_data data = {}; > > data.machine = MACHINE_PC; > + data.arch = "x86"; > data.machine_param = ",hpet=off"; > data.variant = ".nohpet"; > test_acpi_one(NULL, &data); > @@ -1395,6 +1421,7 @@ static void test_acpi_q35_tcg_numamem(void) > test_data data = {}; > > data.machine = MACHINE_Q35; > + data.arch = "x86", > data.variant = ".numamem"; > test_acpi_one(" -object memory-backend-ram,id=ram0,size=128M" > " -numa node -numa node,memdev=ram0", &data); > @@ -1406,6 +1433,7 @@ static void test_acpi_q35_kvm_xapic(void) > test_data data = {}; > > data.machine = MACHINE_Q35; > + data.arch = "x86", > data.variant = ".xapic"; > test_acpi_one(" -object memory-backend-ram,id=ram0,size=128M" > " -numa node -numa node,memdev=ram0" > @@ -1418,6 +1446,7 @@ static void test_acpi_q35_tcg_nosmm(void) > test_data data = {}; > > data.machine = MACHINE_Q35; > + data.arch = "x86", > data.variant = ".nosmm"; > test_acpi_one("-machine smm=off", &data); > free_test_data(&data); > @@ -1428,6 +1457,7 @@ static void test_acpi_q35_tcg_smm_compat(void) > test_data data = {}; > > data.machine = MACHINE_Q35; > + data.arch = "x86", > data.variant = ".smm-compat"; > test_acpi_one("-global ICH9-LPC.smm-compat=on", &data); > free_test_data(&data); > @@ -1438,6 +1468,7 @@ static void test_acpi_q35_tcg_smm_compat_nosmm(void) > test_data data = {}; > > data.machine = MACHINE_Q35; > + data.arch = "x86", > data.variant = ".smm-compat-nosmm"; > test_acpi_one("-global ICH9-LPC.smm-compat=on -machine smm=off", &data); > free_test_data(&data); > @@ -1448,6 +1479,7 @@ static void test_acpi_q35_tcg_nohpet(void) > test_data data = {}; > > data.machine = MACHINE_Q35; > + data.arch = "x86", > data.machine_param = ",hpet=off"; > data.variant = ".nohpet"; > test_acpi_one(NULL, &data); > @@ -1459,6 +1491,7 @@ static void test_acpi_q35_kvm_dmar(void) > test_data data = {}; > > data.machine = MACHINE_Q35; > + data.arch = "x86", > data.variant = ".dmar"; > test_acpi_one("-machine kernel-irqchip=split -accel kvm" > " -device intel-iommu,intremap=on,device-iotlb=on", &data); > @@ -1470,6 +1503,7 @@ static void test_acpi_q35_tcg_ivrs(void) > test_data data = {}; > > data.machine = MACHINE_Q35; > + data.arch = "x86", > data.variant = ".ivrs"; > data.tcg_only = true, > test_acpi_one(" -device amd-iommu", &data); > @@ -1481,6 +1515,7 @@ static void test_acpi_piix4_tcg_numamem(void) > test_data data = {}; > > data.machine = MACHINE_PC; > + data.arch = "x86"; > data.variant = ".numamem"; > test_acpi_one(" -object memory-backend-ram,id=ram0,size=128M" > " -numa node -numa node,memdev=ram0", &data); > @@ -1489,8 +1524,9 @@ static void test_acpi_piix4_tcg_numamem(void) > > uint64_t tpm_tis_base_addr; > > -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 = g_strdup_printf("qemu-test_acpi_%s_tcg_%s.XXXXXX", > machine, tpm_if); > @@ -1517,6 +1553,7 @@ static void test_acpi_tcg_tpm(const char *machine, const char *tpm_if, > tpm_emu_test_wait_cond(&test); > > data.machine = machine; > + data.arch = arch; > data.variant = variant; > > args = g_strdup_printf( > @@ -1540,19 +1577,20 @@ static void test_acpi_tcg_tpm(const char *machine, const char *tpm_if, > > 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); > } > > 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); > } > > -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 = {}; > > data.machine = machine; > + data.arch = arch; > data.variant = ".dimmpxm"; > test_acpi_one(" -machine nvdimm=on,nvdimm-persistence=cpu" > " -smp 4,sockets=4" > @@ -1579,12 +1617,12 @@ static void test_acpi_tcg_dimm_pxm(const char *machine) > > static void test_acpi_q35_tcg_dimm_pxm(void) > { > - test_acpi_tcg_dimm_pxm(MACHINE_Q35); > + test_acpi_tcg_dimm_pxm(MACHINE_Q35, "x86"); > } > > static void test_acpi_piix4_tcg_dimm_pxm(void) > { > - test_acpi_tcg_dimm_pxm(MACHINE_PC); > + test_acpi_tcg_dimm_pxm(MACHINE_PC, "x86"); > } > > 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 = "microvm"; > + data->arch = "x86"; > data->required_struct_types = NULL; /* no smbios */ > data->required_struct_types_len = 0; > data->blkdev = "virtio-blk-device"; > @@ -1737,11 +1776,12 @@ static void test_acpi_aarch64_virt_tcg_pxb(void) > free_test_data(&data); > } > > -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 = {}; > > data.machine = machine; > + data.arch = arch; > data.variant = ".acpihmat"; > test_acpi_one(" -machine hmat=on" > " -smp 2,sockets=2" > @@ -1770,12 +1810,12 @@ static void test_acpi_tcg_acpi_hmat(const char *machine) > > static void test_acpi_q35_tcg_acpi_hmat(void) > { > - test_acpi_tcg_acpi_hmat(MACHINE_Q35); > + test_acpi_tcg_acpi_hmat(MACHINE_Q35, "x86"); > } > > static void test_acpi_piix4_tcg_acpi_hmat(void) > { > - test_acpi_tcg_acpi_hmat(MACHINE_PC); > + test_acpi_tcg_acpi_hmat(MACHINE_PC, "x86"); > } > > static void test_acpi_aarch64_virt_tcg_acpi_hmat(void) > @@ -1841,6 +1881,7 @@ static void test_acpi_q35_tcg_acpi_hmat_noinitiator(void) > test_data data = {}; > > data.machine = MACHINE_Q35; > + data.arch = "x86"; > data.variant = ".acpihmat-noinitiator"; > test_acpi_one(" -machine hmat=on" > " -smp 4,sockets=2" > @@ -1884,13 +1925,14 @@ static void test_acpi_q35_tcg_acpi_hmat_noinitiator(void) > } > > #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 = g_dir_make_tmp("qemu-test-erst.XXXXXX", NULL); > gchar *params; > test_data data = {}; > > data.machine = machine; > + data.arch = arch; > data.variant = ".acpierst"; > params = g_strdup_printf( > " -object memory-backend-file,id=erstnvram," > @@ -1905,12 +1947,12 @@ static void test_acpi_erst(const char *machine) > > static void test_acpi_piix4_acpi_erst(void) > { > - test_acpi_erst(MACHINE_PC); > + test_acpi_erst(MACHINE_PC, "x86"); > } > > static void test_acpi_q35_acpi_erst(void) > { > - test_acpi_erst(MACHINE_Q35); > + test_acpi_erst(MACHINE_Q35, "x86"); > } > > static void test_acpi_microvm_acpi_erst(void) > @@ -1978,6 +2020,7 @@ static void test_acpi_q35_viot(void) > { > test_data data = { > .machine = MACHINE_Q35, > + .arch = "x86", > .variant = ".viot", > }; > > @@ -2002,6 +2045,7 @@ static void test_acpi_q35_cxl(void) > > test_data data = { > .machine = MACHINE_Q35, > + .arch = "x86", > .variant = ".cxl", > }; > /* > @@ -2067,6 +2111,7 @@ static void test_acpi_q35_slic(void) > { > test_data data = { > .machine = MACHINE_Q35, > + .arch = "x86", > .variant = ".slic", > }; > > @@ -2081,6 +2126,7 @@ static void test_acpi_q35_applesmc(void) > { > test_data data = { > .machine = MACHINE_Q35, > + .arch = "x86", > .variant = ".applesmc", > }; > > @@ -2094,6 +2140,7 @@ static void test_acpi_q35_pvpanic_isa(void) > { > test_data data = { > .machine = MACHINE_Q35, > + .arch = "x86", > .variant = ".pvpanic-isa", > }; > > @@ -2106,6 +2153,7 @@ static void test_acpi_pc_smbios_options(void) > uint8_t req_type11[] = { 11 }; > test_data data = { > .machine = MACHINE_PC, > + .arch = "x86", > .variant = ".pc_smbios_options", > .required_struct_types = req_type11, > .required_struct_types_len = ARRAY_SIZE(req_type11), > @@ -2120,6 +2168,7 @@ static void test_acpi_pc_smbios_blob(void) > uint8_t req_type11[] = { 11 }; > test_data data = { > .machine = MACHINE_PC, > + .arch = "x86", > .variant = ".pc_smbios_blob", > .required_struct_types = req_type11, > .required_struct_types_len = ARRAY_SIZE(req_type11), > @@ -2169,6 +2218,7 @@ static void test_acpi_piix4_oem_fields(void) > test_data data = {}; > > data.machine = MACHINE_PC; > + data.arch = "x86"; > data.required_struct_types = base_required_struct_types; > data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types); > > @@ -2187,6 +2237,7 @@ static void test_acpi_q35_oem_fields(void) > test_data data = {}; > > data.machine = MACHINE_Q35; > + data.arch = "x86"; > data.required_struct_types = base_required_struct_types; > data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types); >