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 58C38CD3447 for ; Tue, 19 Sep 2023 07:10:38 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiUs3-0008V9-52; Tue, 19 Sep 2023 03:10:07 -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 1qiUs1-0008UK-Gb for qemu-devel@nongnu.org; Tue, 19 Sep 2023 03:10:05 -0400 Received: from mgamail.intel.com ([192.55.52.115]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiUrz-0000vC-Pq for qemu-devel@nongnu.org; Tue, 19 Sep 2023 03:10:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695107403; x=1726643403; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=tTh1kLJMGqzSI/Gj5+5//5o7gE6qvLTX/rxyfLFOo5Y=; b=iKWqtFNlNsq0JGTYpzE+e5UtiAsuteO1JwmaZOQHVZXiB92gUkSLx4mF v5PbzuJWPToWn9vfxvIF87EDlrbXQjXOpr+sQPZzT9OZWRxJgrvJhzAkk cuAf8hhx/Fy+aP5K5MQYALzgvNCCf5UEMyoVilJRXs/ubdBtXnx6uO85g p0qG4BLKwMQBL5lsyZwheElDmtC/RvUPj4ggGYFRtz1K3WhK12eUWHNH7 cQurvVBS2E2+MoMUbmb8En/zMwtSv2PHFjvwkekcVrjx2e1dvfvHwfmxv Hm2nCvijbAk1wPsrugu/V6PH6axQ36WYuP5U8mqMIcSQKcPsNI1srUmfR g==; X-IronPort-AV: E=McAfee;i="6600,9927,10837"; a="379772818" X-IronPort-AV: E=Sophos;i="6.02,158,1688454000"; d="scan'208";a="379772818" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Sep 2023 00:09:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10837"; a="869870808" X-IronPort-AV: E=Sophos;i="6.02,158,1688454000"; d="scan'208";a="869870808" Received: from liuzhao-optiplex-7080.sh.intel.com (HELO localhost) ([10.239.160.36]) by orsmga004.jf.intel.com with ESMTP; 19 Sep 2023 00:09:21 -0700 Date: Tue, 19 Sep 2023 15:20:25 +0800 From: Zhao Liu To: Igor Mammedov Cc: "Michael S . Tsirkin" , Ani Sinha , Eduardo Habkost , Marcel Apfelbaum , Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= , Yanan Wang , qemu-devel@nongnu.org, Michael Tokarev , Zhenyu Wang , Zhao Liu Subject: Re: [PATCH 03/16] tests: bios-tables-test: Add test for smbios type4 count Message-ID: References: <20230825033619.2075837-1-zhao1.liu@linux.intel.com> <20230825033619.2075837-4-zhao1.liu@linux.intel.com> <20230915145432.79d27d83@imammedo.users.ipa.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230915145432.79d27d83@imammedo.users.ipa.redhat.com> Received-SPF: none client-ip=192.55.52.115; envelope-from=zhao1.liu@linux.intel.com; helo=mgamail.intel.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Fri, Sep 15, 2023 at 02:54:32PM +0200, Igor Mammedov wrote: > Date: Fri, 15 Sep 2023 14:54:32 +0200 > From: Igor Mammedov > Subject: Re: [PATCH 03/16] tests: bios-tables-test: Add test for smbios > type4 count > X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; x86_64-redhat-linux-gnu) > > On Fri, 25 Aug 2023 11:36:06 +0800 > Zhao Liu wrote: > > > From: Zhao Liu > > > > This tests the commit d79a284a44bb7 ("hw/smbios: Fix smbios_smp_sockets > > calculation"). > > > > Test the count of type4 tables for multiple sockets case. > > > > Suggested-by: Igor Mammedov > > Signed-off-by: Zhao Liu > > --- > > tests/qtest/bios-tables-test.c | 33 ++++++++++++++++++++++++++++++++- > > 1 file changed, 32 insertions(+), 1 deletion(-) > > > > diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c > > index 47ba20b9579b..8679255449cf 100644 > > --- a/tests/qtest/bios-tables-test.c > > +++ b/tests/qtest/bios-tables-test.c > > @@ -97,6 +97,7 @@ typedef struct { > > uint16_t smbios_core_count2; > > uint8_t *required_struct_types; > > int required_struct_types_len; > > + int type4_count; > > QTestState *qts; > > } test_data; > > > > @@ -673,12 +674,21 @@ static void smbios_cpu_test(test_data *data, uint32_t addr, > > } > > } > > > > +static void smbios_type4_count_test(test_data *data, int type4_count) > > +{ > > + int expected_type4_count = data->type4_count; > > + > > + if (expected_type4_count) { > > + g_assert_cmpuint(type4_count, ==, expected_type4_count); > > + } > > +} > > + > > static void test_smbios_structs(test_data *data, SmbiosEntryPointType ep_type) > > { > > DECLARE_BITMAP(struct_bitmap, SMBIOS_MAX_TYPE+1) = { 0 }; > > > > SmbiosEntryPoint *ep_table = &data->smbios_ep_table; > > - int i = 0, len, max_len = 0; > > + int i = 0, len, max_len = 0, type4_count = 0; > > uint8_t type, prv, crt; > > uint64_t addr; > > > > @@ -704,6 +714,7 @@ static void test_smbios_structs(test_data *data, SmbiosEntryPointType ep_type) > > > > if (type == 4) { > > smbios_cpu_test(data, addr, ep_type); > > + type4_count++; > > } > > > > /* seek to end of unformatted string area of this struct ("\0\0") */ > > @@ -747,6 +758,8 @@ static void test_smbios_structs(test_data *data, SmbiosEntryPointType ep_type) > > for (i = 0; i < data->required_struct_types_len; i++) { > > g_assert(test_bit(data->required_struct_types[i], struct_bitmap)); > > } > > + > > + smbios_type4_count_test(data, type4_count); > > } > > > > static void test_acpi_load_tables(test_data *data) > > @@ -970,6 +983,22 @@ static void test_acpi_q35_tcg(void) > > free_test_data(&data); > > } > > > > +static void test_acpi_q35_tcg_type4_count(void) > > +{ > > + test_data data = { > > + .machine = MACHINE_Q35, > > + .variant = ".type4-count", > > + .required_struct_types = base_required_struct_types, > > + .required_struct_types_len = ARRAY_SIZE(base_required_struct_types), > > + .type4_count = 5, > > + }; > > + > > + test_acpi_one("-machine smbios-entry-point-type=64 " > > + "-smp cpus=100,maxcpus=120,sockets=5," > > + "dies=2,cores=4,threads=3", &data); > > I'd add to commit message an explanation why above topology was picked up Ok. I'll. Because it defines mutiple sockets and smbios build type4 per socket. Thanks, Zhao > > > + free_test_data(&data); > > +} > > + > > static void test_acpi_q35_tcg_core_count2(void) > > { > > test_data data = { > > @@ -2135,6 +2164,8 @@ int main(int argc, char *argv[]) > > if (has_kvm) { > > qtest_add_func("acpi/q35/kvm/xapic", test_acpi_q35_kvm_xapic); > > qtest_add_func("acpi/q35/kvm/dmar", test_acpi_q35_kvm_dmar); > > + qtest_add_func("acpi/q35/type4-count", > > + test_acpi_q35_tcg_type4_count); > > qtest_add_func("acpi/q35/core-count2", > > test_acpi_q35_tcg_core_count2); > > } >