From nobody Wed Oct 22 13:04:26 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519790735001212.2688341774434; Tue, 27 Feb 2018 20:05:35 -0800 (PST) Received: from localhost ([::1]:42096 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqszl-0005h5-7U for importer@patchew.org; Tue, 27 Feb 2018 23:05:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54601) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqsxc-0004WA-MN for qemu-devel@nongnu.org; Tue, 27 Feb 2018 23:03:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eqsxb-0002N3-6S for qemu-devel@nongnu.org; Tue, 27 Feb 2018 23:03:20 -0500 Received: from mga05.intel.com ([192.55.52.43]:46587) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eqsxa-0002Kn-Pt for qemu-devel@nongnu.org; Tue, 27 Feb 2018 23:03:19 -0500 Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Feb 2018 20:03:18 -0800 Received: from hz-desktop.sh.intel.com (HELO localhost) ([10.239.13.35]) by orsmga006.jf.intel.com with ESMTP; 27 Feb 2018 20:03:16 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,403,1515484800"; d="scan'208";a="21604806" From: Haozhong Zhang To: qemu-devel@nongnu.org Date: Wed, 28 Feb 2018 12:02:59 +0800 Message-Id: <20180228040300.8914-3-haozhong.zhang@intel.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180228040300.8914-1-haozhong.zhang@intel.com> References: <20180228040300.8914-1-haozhong.zhang@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.43 Subject: [Qemu-devel] [PATCH v2 2/3] tests/bios-tables-test: allow setting extra machine options 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: Haozhong Zhang , Xiao Guangrong , mst@redhat.com, Eduardo Habkost , Stefan Hajnoczi , Paolo Bonzini , Marcel Apfelbaum , Igor Mammedov , Dan Williams , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Some test cases may require extra machine options than the those used in the current test_acpi_ones(), e.g., nvdimm test cases require the machine option 'nvdimm=3Don'. Signed-off-by: Haozhong Zhang --- tests/bios-tables-test.c | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 65b271a173..d45181aa51 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -654,17 +654,22 @@ static void test_smbios_structs(test_data *data) } } =20 -static void test_acpi_one(const char *params, test_data *data) +static void test_acpi_one(const char *extra_machine_opts, + const char *params, test_data *data) { char *args; =20 /* Disable kernel irqchip to be able to override apic irq0. */ - args =3D g_strdup_printf("-machine %s,accel=3D%s,kernel-irqchip=3Doff " + args =3D g_strdup_printf("-machine %s,accel=3D%s,kernel-irqchip=3Doff", + data->machine, "kvm:tcg"); + if (extra_machine_opts) { + args =3D g_strdup_printf("%s,%s", args, extra_machine_opts); + } + args =3D g_strdup_printf("%s " "-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); + args, params ? params : "", disk); =20 qtest_start(args); =20 @@ -711,7 +716,7 @@ static void test_acpi_piix4_tcg(void) data.machine =3D MACHINE_PC; 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); + test_acpi_one(NULL, NULL, &data); free_test_data(&data); } =20 @@ -724,7 +729,7 @@ static void test_acpi_piix4_tcg_bridge(void) 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); - test_acpi_one("-device pci-bridge,chassis_nr=3D1", &data); + test_acpi_one(NULL, "-device pci-bridge,chassis_nr=3D1", &data); free_test_data(&data); } =20 @@ -736,7 +741,7 @@ static void test_acpi_q35_tcg(void) data.machine =3D MACHINE_Q35; 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); + test_acpi_one(NULL, NULL, &data); free_test_data(&data); } =20 @@ -749,7 +754,7 @@ static void test_acpi_q35_tcg_bridge(void) 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); - test_acpi_one("-device pci-bridge,chassis_nr=3D1", + test_acpi_one(NULL, "-device pci-bridge,chassis_nr=3D1", &data); free_test_data(&data); } @@ -761,7 +766,8 @@ static void test_acpi_piix4_tcg_cphp(void) memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_PC; data.variant =3D ".cphp"; - test_acpi_one("-smp 2,cores=3D3,sockets=3D2,maxcpus=3D6" + test_acpi_one(NULL, + "-smp 2,cores=3D3,sockets=3D2,maxcpus=3D6" " -numa node -numa node" " -numa dist,src=3D0,dst=3D1,val=3D21", &data); @@ -775,7 +781,8 @@ static void test_acpi_q35_tcg_cphp(void) memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_Q35; data.variant =3D ".cphp"; - test_acpi_one(" -smp 2,cores=3D3,sockets=3D2,maxcpus=3D6" + test_acpi_one(NULL, + " -smp 2,cores=3D3,sockets=3D2,maxcpus=3D6" " -numa node -numa node" " -numa dist,src=3D0,dst=3D1,val=3D21", &data); @@ -795,7 +802,8 @@ static void test_acpi_q35_tcg_ipmi(void) 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); - test_acpi_one("-device ipmi-bmc-sim,id=3Dbmc0" + test_acpi_one(NULL, + "-device ipmi-bmc-sim,id=3Dbmc0" " -device isa-ipmi-bt,bmc=3Dbmc0", &data); free_test_data(&data); @@ -813,7 +821,8 @@ static void test_acpi_piix4_tcg_ipmi(void) 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); - test_acpi_one("-device ipmi-bmc-sim,id=3Dbmc0" + test_acpi_one(NULL, + "-device ipmi-bmc-sim,id=3Dbmc0" " -device isa-ipmi-kcs,irq=3D0,bmc=3Dbmc0", &data); free_test_data(&data); @@ -826,7 +835,8 @@ static void test_acpi_q35_tcg_memhp(void) memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_Q35; data.variant =3D ".memhp"; - test_acpi_one(" -m 128,slots=3D3,maxmem=3D1G" + test_acpi_one(NULL, + " -m 128,slots=3D3,maxmem=3D1G" " -numa node -numa node" " -numa dist,src=3D0,dst=3D1,val=3D21", &data); @@ -840,7 +850,8 @@ static void test_acpi_piix4_tcg_memhp(void) memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_PC; data.variant =3D ".memhp"; - test_acpi_one(" -m 128,slots=3D3,maxmem=3D1G" + test_acpi_one(NULL, + " -m 128,slots=3D3,maxmem=3D1G" " -numa node -numa node" " -numa dist,src=3D0,dst=3D1,val=3D21", &data); @@ -854,7 +865,8 @@ static void test_acpi_q35_tcg_numamem(void) memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_Q35; data.variant =3D ".numamem"; - test_acpi_one(" -numa node -numa node,mem=3D128", &data); + test_acpi_one(NULL, + " -numa node -numa node,mem=3D128", &data); free_test_data(&data); } =20 @@ -865,7 +877,8 @@ static void test_acpi_piix4_tcg_numamem(void) memset(&data, 0, sizeof(data)); data.machine =3D MACHINE_PC; data.variant =3D ".numamem"; - test_acpi_one(" -numa node -numa node,mem=3D128", &data); + test_acpi_one(NULL, + " -numa node -numa node,mem=3D128", &data); free_test_data(&data); } =20 --=20 2.14.1