From nobody Thu Dec 18 12:35:42 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=1692934105; cv=none; d=zohomail.com; s=zohoarc; b=HbK8snRlT+2/uEcleO6aZmMhZ4gtoBNPYCSNTmFiWqpF/kyrVC5iguMiVkVb8E3HT8zE+cPSyiEx6bFjRtz1yQdptCJRNyTAbO874C9BpU62Xkd7xi2YsoWWkw/QC0LjHXxYb0MwAakDKrU0tgROZJD5oRUf8o7yP5hDXBMxwHM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692934105; 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=Th4ne2Is6gbTgD5O+HdNNc8ioeWiQ4cmHyG2sjDRv4U=; b=BCsm0ECaa3xWBJrP4uZMFXAwOYpI4kyJljn7FxstX+Owarv/quEL4QARc6/l810XF5n1LgrC1y7WoxsCWWlsHQGoj2jBpzjTz3IOc24SBvG1bYulgE1JA+1uCF5GemXeln6GGU9JDlqjGgnRFHuUdyaWLAbqvblw5HbBVToadag= 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 1692934105022744.6830415423804; Thu, 24 Aug 2023 20:28:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZNSv-0000KR-7k; Thu, 24 Aug 2023 23:26:29 -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 1qZNSt-0000KG-OJ for qemu-devel@nongnu.org; Thu, 24 Aug 2023 23:26:27 -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 1qZNSr-0003xB-F7 for qemu-devel@nongnu.org; Thu, 24 Aug 2023 23:26:27 -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:24 -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:21 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1692933985; x=1724469985; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ObQGvIElalcU6D+A4r4VnixN9YLi5eYWKH2jkpoEjzE=; b=Nf+qf/KNtb5Z+9xVgO40rFDkWJ3LnW+OLBQABQ8eqNo2C+AykLlIGCVx MAMZaDVvBuJ1rehtq+xEz4DE/wTs7HtCgWWh0aodGihO8IbppLZUh9WIk 7djE4U7Kb/g8fO1Pe3sKZVrMg1E1Zzc03za7+DNyoU2FXXtQazjyv73WY Nop9nOKZbJxa1mNscheSoqYuMh42bD+Xuzfbb5XmjhfuS48HFBFQYJh9c KMyyEHHFX3ja2h4oqzLVgjpTu11iyQFwoHA7DIdIYKw151gtiem4bWc9y et74OJ2yTZxktEkArQbMcDureywNnu05gYguu+UZK49Mi70Ofy37y71ii Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10812"; a="374595629" X-IronPort-AV: E=Sophos;i="6.02,195,1688454000"; d="scan'208";a="374595629" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10812"; a="714201495" X-IronPort-AV: E=Sophos;i="6.02,195,1688454000"; d="scan'208";a="714201495" 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 03/16] tests: bios-tables-test: Add test for smbios type4 count Date: Fri, 25 Aug 2023 11:36:06 +0800 Message-Id: <20230825033619.2075837-4-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: 1692934106648100003 Content-Type: text/plain; charset="utf-8" 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; =20 @@ -673,12 +674,21 @@ static void smbios_cpu_test(test_data *data, uint32_t= addr, } } =20 +static void smbios_type4_count_test(test_data *data, int type4_count) +{ + int expected_type4_count =3D data->type4_count; + + if (expected_type4_count) { + g_assert_cmpuint(type4_count, =3D=3D, expected_type4_count); + } +} + static void test_smbios_structs(test_data *data, SmbiosEntryPointType ep_t= ype) { DECLARE_BITMAP(struct_bitmap, SMBIOS_MAX_TYPE+1) =3D { 0 }; =20 SmbiosEntryPoint *ep_table =3D &data->smbios_ep_table; - int i =3D 0, len, max_len =3D 0; + int i =3D 0, len, max_len =3D 0, type4_count =3D 0; uint8_t type, prv, crt; uint64_t addr; =20 @@ -704,6 +714,7 @@ static void test_smbios_structs(test_data *data, Smbios= EntryPointType ep_type) =20 if (type =3D=3D 4) { smbios_cpu_test(data, addr, ep_type); + type4_count++; } =20 /* seek to end of unformatted string area of this struct ("\0\0") = */ @@ -747,6 +758,8 @@ static void test_smbios_structs(test_data *data, Smbios= EntryPointType ep_type) for (i =3D 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); } =20 static void test_acpi_load_tables(test_data *data) @@ -970,6 +983,22 @@ static void test_acpi_q35_tcg(void) free_test_data(&data); } =20 +static void test_acpi_q35_tcg_type4_count(void) +{ + test_data data =3D { + .machine =3D MACHINE_Q35, + .variant =3D ".type4-count", + .required_struct_types =3D base_required_struct_types, + .required_struct_types_len =3D ARRAY_SIZE(base_required_struct_typ= es), + .type4_count =3D 5, + }; + + test_acpi_one("-machine smbios-entry-point-type=3D64 " + "-smp cpus=3D100,maxcpus=3D120,sockets=3D5," + "dies=3D2,cores=3D4,threads=3D3", &data); + free_test_data(&data); +} + static void test_acpi_q35_tcg_core_count2(void) { test_data data =3D { @@ -2135,6 +2164,8 @@ int main(int argc, char *argv[]) if (has_kvm) { qtest_add_func("acpi/q35/kvm/xapic", test_acpi_q35_kvm_xap= ic); 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); } --=20 2.34.1