From patchwork Fri Aug 25 03:36:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Liu X-Patchwork-Id: 13365015 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 29FCCC3DA66 for ; Fri, 25 Aug 2023 03:27:35 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZNTE-0000Oa-H1; Thu, 24 Aug 2023 23:26:48 -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 1qZNTD-0000OO-F3 for qemu-devel@nongnu.org; Thu, 24 Aug 2023 23:26:47 -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 1qZNTB-00042O-7i for qemu-devel@nongnu.org; Thu, 24 Aug 2023 23:26:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1692934005; x=1724470005; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Pn/QoX0q7AelWXWeFIfMCujE1RbeHS2Mvp1hS9zkzDw=; b=Nt0W3XncIW+gSGiOwQLBqqZZU8liDBXzbI/AZdoNpMk88cWt9drVWZLZ H+FIkXgbnm6N97CFkjsBS1LJ3In1lcCRcH+DtGKZdccxPV/3PBag93bKO 3Nwx0d/02Aireu01xwNYBMrD4qDt75tcN2xgIwNnZAvrIjR2D/3fLPdyT yHdxouHIuvbitK/zrkJmp/y7ghja7qjHfi2vfyRlJyRjix7I0Uj+lkPEO xToca1233eOw4SyAGm54NkHkysi852k9pQ8+BR6olzK1Xl32VVkPYsdB/ Lw5zGpvMWEtmtQxQ/lr26wTXxyFTvVK7yoYOPtze8B4H16oqsxU748YxH A==; X-IronPort-AV: E=McAfee;i="6600,9927,10812"; a="374595690" X-IronPort-AV: E=Sophos;i="6.02,195,1688454000"; d="scan'208";a="374595690" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Aug 2023 20:26:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10812"; a="714201549" X-IronPort-AV: E=Sophos;i="6.02,195,1688454000"; d="scan'208";a="714201549" Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by orsmga006.jf.intel.com with ESMTP; 24 Aug 2023 20:26:36 -0700 From: Zhao Liu To: "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Eduardo Habkost , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Yanan Wang , qemu-devel@nongnu.org Cc: Michael Tokarev , Zhenyu Wang , Zhao Liu Subject: [PATCH 06/16] tests: bios-tables-test: Add test for smbios type4 core count Date: Fri, 25 Aug 2023 11:36:09 +0800 Message-Id: <20230825033619.2075837-7-zhao1.liu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230825033619.2075837-1-zhao1.liu@linux.intel.com> References: <20230825033619.2075837-1-zhao1.liu@linux.intel.com> MIME-Version: 1.0 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 From: Zhao Liu This tests the commit 196ea60a734c3 ("hw/smbios: Fix core count in type4"). Test the core count field of type4 table for multiple sockets/dies case. Suggested-by: Igor Mammedov Signed-off-by: Zhao Liu --- tests/qtest/bios-tables-test.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 8679255449cf..a35c753a3a00 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -999,6 +999,23 @@ static void test_acpi_q35_tcg_type4_count(void) free_test_data(&data); } +static void test_acpi_q35_tcg_core_count(void) +{ + test_data data = { + .machine = MACHINE_Q35, + .variant = ".core-count", + .required_struct_types = base_required_struct_types, + .required_struct_types_len = ARRAY_SIZE(base_required_struct_types), + .smbios_core_count = 9, + .smbios_core_count2 = 9, + }; + + test_acpi_one("-machine smbios-entry-point-type=64 " + "-smp 54,sockets=2,dies=3,cores=3,threads=3", + &data); + free_test_data(&data); +} + static void test_acpi_q35_tcg_core_count2(void) { test_data data = { @@ -2166,6 +2183,8 @@ int main(int argc, char *argv[]) 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-count", + test_acpi_q35_tcg_core_count); qtest_add_func("acpi/q35/core-count2", test_acpi_q35_tcg_core_count2); }