From nobody Thu Dec 18 12:35:41 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1692934076; cv=none; d=zohomail.com; s=zohoarc; b=IkH5mdXkIwCoHTFgTX6Q4tH2aApiFX+OUUGW7Db2HU0QbRbpIeo6VO8VBTt0SEFBBy8GZtMNKZSUwDrhXe/PXYOd/toO20FX2N+jUfNszeZd5eeIxogc2Enbi2e61/ZsX3Pl+9jXQyDbmn5SSbpTDktj12xxmtgqZn9lMj/NhtA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692934076; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pjpzDtgo67tF95Bz817gAtyZST+IRMn4iVT6kbyzpwk=; b=GCGW67JFoeE2zs/YVIZaNSWyyeAKig5CYlYpJW5NK4bd/f3i4XuCFeYBofxm/5cyLWbgyM2t9pg0GAFDcUcmA/oQK5b4Os6dF7ABeverU6Hj0n5bSyu2FaYu09hb4uoYY3GpL7Y7Lmlf8GtdiwTnP9tnPalqKD7RODRhu9M5J34= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=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 1692934076538606.0159379815922; Thu, 24 Aug 2023 20:27:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZNTY-0000Zl-BZ; Thu, 24 Aug 2023 23:27:08 -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 1qZNTR-0000YX-IV for qemu-devel@nongnu.org; Thu, 24 Aug 2023 23:27:01 -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 1qZNTP-00042O-ER for qemu-devel@nongnu.org; Thu, 24 Aug 2023 23:27:01 -0400 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:51 -0700 Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by orsmga006.jf.intel.com with ESMTP; 24 Aug 2023 20:26:48 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1692934019; x=1724470019; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gyRmDva2+YMakIHRrZ1nh0nHDhYXSzjXHjNEV/Z4Yd0=; b=cOQBOFN2BkKA9TiI1m/J6lHclHav7ViuxWFswFAc9LZoI8JKFSHX6YMc OMyg2GL8IXA6RkHI1buiyRVsH26fkEfKKAWyi4syGST2toXwf5/udMJKq PvPubLv0SlsCniB0+pj8uSHqLwQ90sWDvwSdBh1xUmhHPleDxbnnpGt7N DX1bYOTUr/zhqbxrwkoz6zyVhOLRKvMeB4ablmxoC/7LFLpVlGuDLbXKI epQ+YjHg5vTPGzrZRYPCsvkCZv1YrvUN8j2gcuAyLAJz66+mGBZHQHux9 LY6fuo+xfZy3pbN+KnO4DFSihw791ZcIBitJ/wZfG55F0GuVLUnvev5rc A==; X-IronPort-AV: E=McAfee;i="6600,9927,10812"; a="374595727" X-IronPort-AV: E=Sophos;i="6.02,195,1688454000"; d="scan'208";a="374595727" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10812"; a="714201601" X-IronPort-AV: E=Sophos;i="6.02,195,1688454000"; d="scan'208";a="714201601" From: Zhao Liu To: "Michael S . Tsirkin" , Igor Mammedov , Ani Sinha , Eduardo Habkost , Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yanan Wang , qemu-devel@nongnu.org Cc: Michael Tokarev , Zhenyu Wang , Zhao Liu Subject: [PATCH 09/16] tests: bios-tables-test: Extend core count2 test to cover general topology Date: Fri, 25 Aug 2023 11:36:12 +0800 Message-Id: <20230825033619.2075837-10-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 Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1692934078529100002 Content-Type: text/plain; charset="utf-8" From: Zhao Liu Currently, this case just covers the topology with only core and smt levels, and doesn't consider more topology layers between socket and core. To cover the fixed case in the commit 196ea60a734c3 ("hw/smbios: Fix core count in type4"), add the "die" level in "-smp" as the more general topology case. Suggested-by: Igor Mammedov Signed-off-by: Zhao Liu Acked-by: Igor Mammedov --- tests/qtest/bios-tables-test.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index a35c753a3a00..8cba1d8126f2 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1024,10 +1024,12 @@ static void test_acpi_q35_tcg_core_count2(void) .required_struct_types =3D base_required_struct_types, .required_struct_types_len =3D ARRAY_SIZE(base_required_struct_typ= es), .smbios_core_count =3D 0xFF, - .smbios_core_count2 =3D 275, + .smbios_core_count2 =3D 260, }; =20 - test_acpi_one("-machine smbios-entry-point-type=3D64 -smp 275", &data); + test_acpi_one("-machine smbios-entry-point-type=3D64 " + "-smp 260,dies=3D2,cores=3D130,threads=3D1", + &data); free_test_data(&data); } =20 --=20 2.34.1