From patchwork Fri May 27 16:56:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Suvorova X-Patchwork-Id: 12863595 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 2FB9DC433F5 for ; Fri, 27 May 2022 17:11:02 +0000 (UTC) Received: from localhost ([::1]:57578 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nudUL-0001OJ-6U for qemu-devel@archiver.kernel.org; Fri, 27 May 2022 13:11:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nudH4-0006Py-5H for qemu-devel@nongnu.org; Fri, 27 May 2022 12:57:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:53665) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nudH1-00071O-1b for qemu-devel@nongnu.org; Fri, 27 May 2022 12:57:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653670634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=V/r0fVu3Mm/+J2eo2wSUrqlf4wYDaG8F36USSn1UEcY=; b=bymRuoNpuv1nH7smZL/EAYl23VKO9eHI78XsYVnCuV/2MFWndQa1QiIQ8zafgScPQZ7A6y Xmt2WIsEBS6OD/QG/Opin8Lqnt9yOBfalX3r50DYiCfW6rhBeSBrk4QgSUjXxdyh+4i1hK y+4PdhSyTz/H76eK574izlWsg+BmOes= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-670-9dV2EDGxM2-60v78ESxThQ-1; Fri, 27 May 2022 12:57:12 -0400 X-MC-Unique: 9dV2EDGxM2-60v78ESxThQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8B1573833295; Fri, 27 May 2022 16:57:12 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.39.192.113]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7900C2026D64; Fri, 27 May 2022 16:57:11 +0000 (UTC) From: Julia Suvorova To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha , Julia Suvorova Subject: [PATCH 1/5] hw/smbios: add core_count2 to smbios table type 4 Date: Fri, 27 May 2022 18:56:47 +0200 Message-Id: <20220527165651.28092-2-jusual@redhat.com> In-Reply-To: <20220527165651.28092-1-jusual@redhat.com> References: <20220527165651.28092-1-jusual@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 Received-SPF: pass client-ip=170.10.133.124; envelope-from=jusual@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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" In order to use the increased number of cpus, we need to bring smbios tables in line with the SMBIOS 3.0 specification. This allows us to introduce core_count2 which acts as a duplicate of core_count if we have fewer cores than 256, and contains the actual core number per socket if we have more. core_enabled2 and thread_count2 fields work the same way. Signed-off-by: Julia Suvorova Reviewed-by: Ani Sinha Reviewed-by: Igor Mammedov --- include/hw/firmware/smbios.h | 3 +++ hw/smbios/smbios.c | 11 +++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/include/hw/firmware/smbios.h b/include/hw/firmware/smbios.h index 4b7ad77a44..c427ae5558 100644 --- a/include/hw/firmware/smbios.h +++ b/include/hw/firmware/smbios.h @@ -187,6 +187,9 @@ struct smbios_type_4 { uint8_t thread_count; uint16_t processor_characteristics; uint16_t processor_family2; + uint16_t core_count2; + uint16_t core_enabled2; + uint16_t thread_count2; } QEMU_PACKED; /* SMBIOS type 11 - OEM strings */ diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index 60349ee402..45d7be6b30 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -709,8 +709,15 @@ static void smbios_build_type_4_table(MachineState *ms, unsigned instance) SMBIOS_TABLE_SET_STR(4, serial_number_str, type4.serial); SMBIOS_TABLE_SET_STR(4, asset_tag_number_str, type4.asset); SMBIOS_TABLE_SET_STR(4, part_number_str, type4.part); - t->core_count = t->core_enabled = ms->smp.cores; - t->thread_count = ms->smp.threads; + + t->core_count = (ms->smp.cores > 255) ? 0xFF : ms->smp.cores; + t->core_enabled = t->core_count; + + t->core_count2 = t->core_enabled2 = cpu_to_le16(ms->smp.cores); + + t->thread_count = (ms->smp.threads > 255) ? 0xFF : ms->smp.threads; + t->thread_count2 = cpu_to_le16(ms->smp.threads); + t->processor_characteristics = cpu_to_le16(0x02); /* Unknown */ t->processor_family2 = cpu_to_le16(0x01); /* Other */ From patchwork Fri May 27 16:56:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Suvorova X-Patchwork-Id: 12863608 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 13113C433F5 for ; Fri, 27 May 2022 17:19:02 +0000 (UTC) Received: from localhost ([::1]:44250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nudc6-0003Fa-0b for qemu-devel@archiver.kernel.org; Fri, 27 May 2022 13:19:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nudH7-0006WO-Qi for qemu-devel@nongnu.org; Fri, 27 May 2022 12:57:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:26371) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nudH5-00071l-U8 for qemu-devel@nongnu.org; Fri, 27 May 2022 12:57:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653670639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7onua6PzehfY7FGKwH5skED1dMOpn6M44VxgVUDqgRo=; b=NuxX+fZ/vCW3YYRZ0hc5jbVbtYtGKigKsGDB4A3vl4Th46EIko4LcjMZOhbfHa/wkkXQZy ammurfIN7OPCyCFONeda69vNsLOdRO/ZLswRLkhh+Kqr8NNlvEBKv6WMzjf+AVz5HS5LV/ WDgeCaDvWmoC0npPtjk8nXT/V6aZvk0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-299-yy_hasfCOtKpQGFznQ0lMA-1; Fri, 27 May 2022 12:57:15 -0400 X-MC-Unique: yy_hasfCOtKpQGFznQ0lMA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 76A3D80B71A; Fri, 27 May 2022 16:57:15 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.39.192.113]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4A6BE2026D64; Fri, 27 May 2022 16:57:14 +0000 (UTC) From: Julia Suvorova To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha , Julia Suvorova Subject: [PATCH 2/5] bios-tables-test: teach test to use smbios 3.0 tables Date: Fri, 27 May 2022 18:56:48 +0200 Message-Id: <20220527165651.28092-3-jusual@redhat.com> In-Reply-To: <20220527165651.28092-1-jusual@redhat.com> References: <20220527165651.28092-1-jusual@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 Received-SPF: pass client-ip=170.10.129.124; envelope-from=jusual@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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" Introduce the 64-bit entry point. Since we no longer have a total number of structures, stop checking for the new ones at the EOF structure (type 127). Signed-off-by: Julia Suvorova --- tests/qtest/bios-tables-test.c | 101 ++++++++++++++++++++++++--------- 1 file changed, 75 insertions(+), 26 deletions(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index a4a46e97f0..0ba9d749a5 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -75,6 +75,14 @@ #define OEM_TEST_ARGS "-machine x-oem-id=" OEM_ID ",x-oem-table-id=" \ OEM_TABLE_ID +#define SMBIOS_VER21 0 +#define SMBIOS_VER30 1 + +typedef struct { + struct smbios_21_entry_point ep21; + struct smbios_30_entry_point ep30; +} smbios_entry_point; + typedef struct { bool tcg_only; const char *machine; @@ -88,8 +96,8 @@ typedef struct { uint64_t rsdp_addr; uint8_t rsdp_table[36 /* ACPI 2.0+ RSDP size */]; GArray *tables; - uint32_t smbios_ep_addr; - struct smbios_21_entry_point smbios_ep_table; + uint64_t smbios_ep_addr[2]; + smbios_entry_point smbios_ep_table; uint16_t smbios_cpu_max_speed; uint16_t smbios_cpu_curr_speed; uint8_t *required_struct_types; @@ -533,10 +541,10 @@ static void test_acpi_asl(test_data *data) free_test_data(&exp_data); } -static bool smbios_ep_table_ok(test_data *data) +static bool smbios_ep2_table_ok(test_data *data) { - struct smbios_21_entry_point *ep_table = &data->smbios_ep_table; - uint32_t addr = data->smbios_ep_addr; + struct smbios_21_entry_point *ep_table = &data->smbios_ep_table.ep21; + uint32_t addr = data->smbios_ep_addr[SMBIOS_VER21]; qtest_memread(data->qts, addr, ep_table, sizeof(*ep_table)); if (memcmp(ep_table->anchor_string, "_SM_", 4)) { @@ -559,29 +567,59 @@ static bool smbios_ep_table_ok(test_data *data) return true; } -static void test_smbios_entry_point(test_data *data) +static bool smbios_ep3_table_ok(test_data *data) +{ + struct smbios_30_entry_point *ep_table = &data->smbios_ep_table.ep30; + uint64_t addr = data->smbios_ep_addr[SMBIOS_VER30]; + + qtest_memread(data->qts, addr, ep_table, sizeof(*ep_table)); + if (memcmp(ep_table->anchor_string, "_SM3_", 5)) { + return false; + } + + if (acpi_calc_checksum((uint8_t *)ep_table, sizeof *ep_table)) { + return false; + } + + return true; +} + +static int test_smbios_entry_point(test_data *data) { uint32_t off; + bool found_ep2 = false, found_ep3 = false; /* find smbios entry point structure */ for (off = 0xf0000; off < 0x100000; off += 0x10) { - uint8_t sig[] = "_SM_"; + uint8_t sig[] = "_SM3_"; int i; for (i = 0; i < sizeof sig - 1; ++i) { sig[i] = qtest_readb(data->qts, off + i); } - if (!memcmp(sig, "_SM_", sizeof sig)) { + if (!found_ep2 && !memcmp(sig, "_SM_", sizeof sig - 2)) { /* signature match, but is this a valid entry point? */ - data->smbios_ep_addr = off; - if (smbios_ep_table_ok(data)) { - break; + data->smbios_ep_addr[SMBIOS_VER21] = off; + if (smbios_ep2_table_ok(data)) { + found_ep2 = true; + } + } else if (!found_ep3 && !memcmp(sig, "_SM3_", sizeof sig - 1)) { + data->smbios_ep_addr[SMBIOS_VER30] = off; + if (smbios_ep3_table_ok(data)) { + found_ep3 = true; } } + + if (found_ep2 || found_ep3) { + break; + } } - g_assert_cmphex(off, <, 0x100000); + g_assert_cmphex(data->smbios_ep_addr[SMBIOS_VER21], <, 0x100000); + g_assert_cmphex(data->smbios_ep_addr[SMBIOS_VER30], <, 0x100000); + + return found_ep3 ? SMBIOS_VER30 : SMBIOS_VER21; } static inline bool smbios_single_instance(uint8_t type) @@ -625,16 +663,23 @@ static bool smbios_cpu_test(test_data *data, uint32_t addr) return true; } -static void test_smbios_structs(test_data *data) +static void test_smbios_structs(test_data *data, int ver) { DECLARE_BITMAP(struct_bitmap, SMBIOS_MAX_TYPE+1) = { 0 }; - struct smbios_21_entry_point *ep_table = &data->smbios_ep_table; - uint32_t addr = le32_to_cpu(ep_table->structure_table_address); - int i, len, max_len = 0; + + smbios_entry_point *ep_table = &data->smbios_ep_table; + int i = 0, len, max_len = 0; uint8_t type, prv, crt; + uint64_t addr; + + if (ver == SMBIOS_VER21) { + addr = le32_to_cpu(ep_table->ep21.structure_table_address); + } else { + addr = le64_to_cpu(ep_table->ep30.structure_table_address); + } /* walk the smbios tables */ - for (i = 0; i < le16_to_cpu(ep_table->number_of_structures); i++) { + do { /* grab type and formatted area length from struct header */ type = qtest_readb(data->qts, addr); @@ -660,19 +705,23 @@ static void test_smbios_structs(test_data *data) } /* keep track of max. struct size */ - if (max_len < len) { + if (ver == SMBIOS_VER21 && max_len < len) { max_len = len; - g_assert_cmpuint(max_len, <=, ep_table->max_structure_size); + g_assert_cmpuint(max_len, <=, ep_table->ep21.max_structure_size); } /* start of next structure */ addr += len; - } - /* total table length and max struct size must match entry point values */ - g_assert_cmpuint(le16_to_cpu(ep_table->structure_table_length), ==, - addr - le32_to_cpu(ep_table->structure_table_address)); - g_assert_cmpuint(le16_to_cpu(ep_table->max_structure_size), ==, max_len); + } while (ver == SMBIOS_VER21 ? + (++i < le16_to_cpu(ep_table->ep21.number_of_structures)) : (type != 127)); + + if (ver == SMBIOS_VER21) { + /* total table length and max struct size must match entry point values */ + g_assert_cmpuint(le16_to_cpu(ep_table->ep21.structure_table_length), ==, + addr - le32_to_cpu(ep_table->ep21.structure_table_address)); + g_assert_cmpuint(le16_to_cpu(ep_table->ep21.max_structure_size), ==, max_len); + } /* required struct types must all be present */ for (i = 0; i < data->required_struct_types_len; i++) { @@ -756,8 +805,8 @@ static void test_acpi_one(const char *params, test_data *data) * https://bugs.launchpad.net/qemu/+bug/1821884 */ if (!use_uefi) { - test_smbios_entry_point(data); - test_smbios_structs(data); + int ver = test_smbios_entry_point(data); + test_smbios_structs(data, ver); } qtest_quit(data->qts); From patchwork Fri May 27 16:56:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Suvorova X-Patchwork-Id: 12863609 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 91C3BC433F5 for ; Fri, 27 May 2022 17:20:51 +0000 (UTC) Received: from localhost ([::1]:47312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nuddq-00063m-Ne for qemu-devel@archiver.kernel.org; Fri, 27 May 2022 13:20:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nudH9-0006XQ-GR for qemu-devel@nongnu.org; Fri, 27 May 2022 12:57:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:55669) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nudH8-00071x-1b for qemu-devel@nongnu.org; Fri, 27 May 2022 12:57:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653670641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MuRUAStxObVwu4tN0neq0DoXAzpl0EiOgW8BlUO66sg=; b=PCzjiGdLHvyX7B2VPgIIayj9LnuOhwMtYKt6wCcoTKQTXpOrqcO0Ofj5s9ZYlQmFcHbeUy t6TzKb4WzVzDUDbx68QF4ytNlneYIH6PGa20nKam6ozG2vjFFsynz0IUDVVgNpJY8JBd1f 3bUxBnX6twZB0/NtIeBiibiY7FVtTE0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-437-32GgZfxaNOioh4vtqYs_mw-1; Fri, 27 May 2022 12:57:18 -0400 X-MC-Unique: 32GgZfxaNOioh4vtqYs_mw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C51C0858EFE; Fri, 27 May 2022 16:57:17 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.39.192.113]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ABB6F2026D64; Fri, 27 May 2022 16:57:16 +0000 (UTC) From: Julia Suvorova To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha , Julia Suvorova Subject: [PATCH 3/5] tests/acpi: allow changes for core_count2 test Date: Fri, 27 May 2022 18:56:49 +0200 Message-Id: <20220527165651.28092-4-jusual@redhat.com> In-Reply-To: <20220527165651.28092-1-jusual@redhat.com> References: <20220527165651.28092-1-jusual@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 Received-SPF: pass client-ip=170.10.129.124; envelope-from=jusual@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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" Signed-off-by: Julia Suvorova Acked-by: Ani Sinha --- tests/qtest/bios-tables-test-allowed-diff.h | 3 +++ tests/data/acpi/q35/APIC.core-count2 | 0 tests/data/acpi/q35/DSDT.core-count2 | 0 tests/data/acpi/q35/FACP.core-count2 | 0 4 files changed, 3 insertions(+) create mode 100644 tests/data/acpi/q35/APIC.core-count2 create mode 100644 tests/data/acpi/q35/DSDT.core-count2 create mode 100644 tests/data/acpi/q35/FACP.core-count2 diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index dfb8523c8b..e81dc67a2e 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,4 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/q35/APIC.core-count2", +"tests/data/acpi/q35/DSDT.core-count2", +"tests/data/acpi/q35/FACP.core-count2", diff --git a/tests/data/acpi/q35/APIC.core-count2 b/tests/data/acpi/q35/APIC.core-count2 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/q35/DSDT.core-count2 b/tests/data/acpi/q35/DSDT.core-count2 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/data/acpi/q35/FACP.core-count2 b/tests/data/acpi/q35/FACP.core-count2 new file mode 100644 index 0000000000..e69de29bb2 From patchwork Fri May 27 16:56:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Suvorova X-Patchwork-Id: 12863610 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 75C26C433EF for ; Fri, 27 May 2022 17:22:47 +0000 (UTC) Received: from localhost ([::1]:50542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nudfi-0000Za-LN for qemu-devel@archiver.kernel.org; Fri, 27 May 2022 13:22:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54942) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nudH9-0006XR-Q2 for qemu-devel@nongnu.org; Fri, 27 May 2022 12:57:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:59750) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nudH8-000726-7Y for qemu-devel@nongnu.org; Fri, 27 May 2022 12:57:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653670641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HJJc10DVqGDEpNlre1qEvs9AhiCw/sv9P3SoXjjmmIU=; b=QVGR0aSKnaBSlSk8bOmjX8Vdr5eLK1QjqZFooor9j3lCrdufYYeEFZX3XfB0nBjTA6R9Cq KVqwF0jRcvjkZ78mc1ed60Aez4IOnNGxX9Sr1+i4QRCLC88I92rwXX2GoPD+rvjp+ukN+I 3kjOH5QMXZ/i4X9wjv0kXYvs8sq4CdY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-472-zpDFvq43Pc-67za7H-h0QA-1; Fri, 27 May 2022 12:57:20 -0400 X-MC-Unique: zpDFvq43Pc-67za7H-h0QA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0EAD41801386; Fri, 27 May 2022 16:57:20 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.39.192.113]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C13FF2026D64; Fri, 27 May 2022 16:57:18 +0000 (UTC) From: Julia Suvorova To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha , Julia Suvorova Subject: [PATCH 4/5] bios-tables-test: add test for number of cores > 255 Date: Fri, 27 May 2022 18:56:50 +0200 Message-Id: <20220527165651.28092-5-jusual@redhat.com> In-Reply-To: <20220527165651.28092-1-jusual@redhat.com> References: <20220527165651.28092-1-jusual@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 Received-SPF: pass client-ip=170.10.133.124; envelope-from=jusual@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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" The new test is run with a large number of cpus and checks if the core_count field in smbios_cpu_test (structure type 4) is correct. Choose q35 as it allows to run with -smp > 255. Signed-off-by: Julia Suvorova Reviewed-by: Ani Sinha --- tests/qtest/bios-tables-test.c | 35 +++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 0ba9d749a5..f2464adaa0 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -100,6 +100,8 @@ typedef struct { smbios_entry_point smbios_ep_table; uint16_t smbios_cpu_max_speed; uint16_t smbios_cpu_curr_speed; + uint8_t smbios_core_count; + uint16_t smbios_core_count2; uint8_t *required_struct_types; int required_struct_types_len; QTestState *qts; @@ -640,8 +642,9 @@ static inline bool smbios_single_instance(uint8_t type) static bool smbios_cpu_test(test_data *data, uint32_t addr) { + uint8_t real_cc, expect_cc = data->smbios_core_count; + uint16_t real, real_cc2, expect_cc2 = data->smbios_core_count2; uint16_t expect_speed[2]; - uint16_t real; int offset[2]; int i; @@ -660,6 +663,20 @@ static bool smbios_cpu_test(test_data *data, uint32_t addr) } } + real_cc = qtest_readb(data->qts, addr + offsetof(struct smbios_type_4, core_count)); + real_cc2 = qtest_readw(data->qts, addr + offsetof(struct smbios_type_4, core_count2)); + + if (expect_cc && (real_cc != expect_cc)) { + fprintf(stderr, "Unexpected SMBIOS CPU count: real %u expect %u\n", + real_cc, expect_cc); + return false; + } + if ((expect_cc == 0xFF) && (real_cc2 != expect_cc2)) { + fprintf(stderr, "Unexpected SMBIOS CPU count2: real %u expect %u\n", + real_cc2, expect_cc2); + return false; + } + return true; } @@ -905,6 +922,21 @@ static void test_acpi_q35_tcg(void) free_test_data(&data); } +static void test_acpi_q35_tcg_core_count2(void) +{ + test_data data = { + .machine = MACHINE_Q35, + .variant = ".core-count2", + .required_struct_types = base_required_struct_types, + .required_struct_types_len = ARRAY_SIZE(base_required_struct_types), + .smbios_core_count = 0xFF, + .smbios_core_count2 = 275, + }; + + test_acpi_one("-machine smbios-entry-point-type=64 -smp 275", &data); + free_test_data(&data); +} + static void test_acpi_q35_tcg_bridge(void) { test_data data; @@ -1787,6 +1819,7 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/piix4/pci-hotplug/off", test_acpi_piix4_no_acpi_pci_hotplug); qtest_add_func("acpi/q35", test_acpi_q35_tcg); + qtest_add_func("acpi/q35/core-count2", test_acpi_q35_tcg_core_count2); qtest_add_func("acpi/q35/bridge", test_acpi_q35_tcg_bridge); qtest_add_func("acpi/q35/multif-bridge", test_acpi_q35_multif_bridge); qtest_add_func("acpi/q35/mmio64", test_acpi_q35_tcg_mmio64); From patchwork Fri May 27 16:56:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Suvorova X-Patchwork-Id: 12863593 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 1DFAFC433F5 for ; Fri, 27 May 2022 17:08:26 +0000 (UTC) Received: from localhost ([::1]:51594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nudRp-0005HU-6h for qemu-devel@archiver.kernel.org; Fri, 27 May 2022 13:08:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nudHG-0006b0-8K for qemu-devel@nongnu.org; Fri, 27 May 2022 12:57:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:52807) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nudHB-00072V-Ac for qemu-devel@nongnu.org; Fri, 27 May 2022 12:57:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653670644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XobTkmrESnCB/oSSwgsTD63tUg8ZNcUBUPM1K/KDJeY=; b=Crw0JCM4FK5xbc2Gr8d+F/At0Io6zXwLxAhNUlZ4FB/2VHJY17zH9WCpPRUBdQao9Z00y1 RdrSOZghhspNnZ/3EvMUf2mS19kjujj7UHCJvGtHBlGWC9HfP6jTPma2ycv5sdenxEtarg b7OgYlj0o1TsbOUnAqPU/04GBD2f/hw= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-447-K4MyqKGFPg-lChctXaOxKg-1; Fri, 27 May 2022 12:57:23 -0400 X-MC-Unique: K4MyqKGFPg-lChctXaOxKg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A3F88801E6B; Fri, 27 May 2022 16:57:22 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.39.192.113]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F09042026D64; Fri, 27 May 2022 16:57:20 +0000 (UTC) From: Julia Suvorova To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Igor Mammedov , Ani Sinha , Julia Suvorova Subject: [PATCH 5/5] tests/acpi: update tables for new core count test Date: Fri, 27 May 2022 18:56:51 +0200 Message-Id: <20220527165651.28092-6-jusual@redhat.com> In-Reply-To: <20220527165651.28092-1-jusual@redhat.com> References: <20220527165651.28092-1-jusual@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 Received-SPF: pass client-ip=170.10.129.124; envelope-from=jusual@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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" Changes in the tables (for 275 cores): FACP: + Use APIC Cluster Model (V4) : 1 APIC: +[02Ch 0044 1] Subtable Type : 00 [Processor Local APIC] +[02Dh 0045 1] Length : 08 +[02Eh 0046 1] Processor ID : 00 +[02Fh 0047 1] Local Apic ID : 00 +[030h 0048 4] Flags (decoded below) : 00000001 + Processor Enabled : 1 ... + +[81Ch 2076 1] Subtable Type : 00 [Processor Local APIC] +[81Dh 2077 1] Length : 08 +[81Eh 2078 1] Processor ID : FE +[81Fh 2079 1] Local Apic ID : FE +[820h 2080 4] Flags (decoded below) : 00000001 + Processor Enabled : 1 + Runtime Online Capable : 0 + +[824h 2084 1] Subtable Type : 09 [Processor Local x2APIC] +[825h 2085 1] Length : 10 +[826h 2086 2] Reserved : 0000 +[828h 2088 4] Processor x2Apic ID : 000000FF +[82Ch 2092 4] Flags (decoded below) : 00000001 + Processor Enabled : 1 +[830h 2096 4] Processor UID : 000000FF ... DSDT: + Processor (C000, 0x00, 0x00000000, 0x00) + { + Method (_STA, 0, Serialized) // _STA: Status + { + Return (CSTA (Zero)) + } + + Name (_MAT, Buffer (0x08) // _MAT: Multiple APIC Table Entry + { + 0x00, 0x08, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 // ........ + }) + Method (_OST, 3, Serialized) // _OST: OSPM Status Indication + { + COST (Zero, Arg0, Arg1, Arg2) + } + } ... + Processor (C0FE, 0xFE, 0x00000000, 0x00) + { + Method (_STA, 0, Serialized) // _STA: Status + { + Return (CSTA (0xFE)) + } + + Name (_MAT, Buffer (0x08) // _MAT: Multiple APIC Table Entry + { + 0x00, 0x08, 0xFE, 0xFE, 0x01, 0x00, 0x00, 0x00 // ........ + }) + Method (_EJ0, 1, NotSerialized) // _EJx: Eject Device, x=0-9 + { + CEJ0 (0xFE) + } + + Method (_OST, 3, Serialized) // _OST: OSPM Status Indication + { + COST (0xFE, Arg0, Arg1, Arg2) + } + } + + Device (C0FF) + { + Name (_HID, "ACPI0007" /* Processor Device */) // _HID: Hardware ID + Name (_UID, 0xFF) // _UID: Unique ID + Method (_STA, 0, Serialized) // _STA: Status + { + Return (CSTA (0xFF)) + } + + Name (_MAT, Buffer (0x10) // _MAT: Multiple APIC Table Entry + { + /* 0000 */ 0x09, 0x10, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, // ........ + /* 0008 */ 0x01, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00 // ........ + }) + Method (_EJ0, 1, NotSerialized) // _EJx: Eject Device, x=0-9 + { + CEJ0 (0xFF) + } + + Method (_OST, 3, Serialized) // _OST: OSPM Status Indication + { + COST (0x0101, Arg0, Arg1, Arg2) + } + } ... Signed-off-by: Julia Suvorova --- tests/qtest/bios-tables-test-allowed-diff.h | 3 --- tests/data/acpi/q35/APIC.core-count2 | Bin 0 -> 2478 bytes tests/data/acpi/q35/DSDT.core-count2 | Bin 0 -> 32429 bytes tests/data/acpi/q35/FACP.core-count2 | Bin 0 -> 244 bytes 4 files changed, 3 deletions(-) diff --git a/tests/data/acpi/q35/APIC.core-count2 b/tests/data/acpi/q35/APIC.core-count2 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a255082ef5bc39f0d92d3e372b91f09dd6d0d9a1 100644 GIT binary patch literal 2478 zcmXZeWl$AS7=Youz=a#M-K}6ZwgLuNAQ;$~*xjvQcY@uCVs{~Sf`WpLVt2Rbe!ORA z_B`J^b9R56*&pj2=M2p(=#;b`y@>U1KQZ2 ztu5Nwq0xx;_UPb%CKH;?XtAKxijI!xf-7uzGc@Q3Gq% z#9Fnmc5SRv2fe+~#|M4+PE2*{()H?L{rcFT0s8r&zdtr?h>aRyuWjcwXs+qT%Q9ky?e9Xepgju;w>ojPIX&e)|3 zcI}GYx?%V37#4;-dSK6<*sB-z?u~u=VBfyjuOIgBj{^qaz=1eu5Dp%ULx$kcp*U<9 z4j+yqM&QViIBFD*9*twh;MlP^ZXAvuj}s=~#ECd*5{8FkL5Yu4b}wYY8_u3wKEHsHpMxM>q^-i%we;MT3UZ5u{MiV+Y2>;Le@6 zYZva`jeGXs-o3bQAMW3e2M*xDgLvo=9zKjmj^NRwcZnq0$#t4H*R2JA|@r_&6{}Z z7A7ZSN($b-jd$+g-Me`29^Su?4<6vdhnSj*j~?OU$C#FePoCh@r}*p{K7WocUf|1@ z`05qDevNP5;M=$O?j62=j~_nZ$B+2w6Mp`TU%ueiulVg7e*ca?e&Ela`0E$`{*8bB z;NQQPo-UeQHSM3S%%ZeJ#vXl>ElNA87Nwn3i_*@jMQIn+qO_}OQQA$lDDAE~Lr49*wAgf6Z7ljNgG@%F cu9Hk={TGbMqHkcbS~Dh#{`5cn(qE|k2lzA_5C8xG literal 0 HcmV?d00001 diff --git a/tests/data/acpi/q35/DSDT.core-count2 b/tests/data/acpi/q35/DSDT.core-count2 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2cd0febc7486b9cb22ba92312f70262a2a0e7baa 100644 GIT binary patch literal 32429 zcmb8&cYKpo7YFbsU8HH+rlo9z3b+;0-MX_nfR@r0QH!=^D8ms2R74btBH)AyZY@~% z-dk~R#f^LKy>a$E=Xq{&f6uw~^Lgcu=G^q&?>RS3a+)U(O|&`Ma{Y;x$x2D{v@XlCWBL;I7VH`gPpR>oH@kg(d;5Y@ z+dUm|Yx>5(y6GM9B7P)wIzx-5zFm-fZ&z7g%+fwf(8JWF`F{k@{@{%gDJZ#&lo_&f1-zGj2p zxr(Wxo_VdEmC>e9#I7;Bv7s>-2^LXZk*4Onk-p)l4zesi-#Gm5rrzG(2c6IgEV2Ui zUT2pvZ*60&C9z8n?TvTUy0o^jrQY&e*5-e*thCl;0Ur0?FV+w(Y;20Q6&94YHMfMU zIA7Bq=c_u7Z}$b-yZvjr+O4kktlr)pt2<{+SBG^@hu`|(m-HU1$CvBWmgmb^k;%1e z{>MtQEUISvv0M$`-mRTO>zYGt_DxLbM^Y(`bxo5~eC@?@+?QzWw__Av}$E6;Z>h+FVYRkouN%hG!=`@>e%|6y_P2HMmc}E58HQP0{ zM3U8Hsh^)s$E~>K@s6@QbQ3k?>Dy>&W2CvoleNk3^U{xo2NAmMrWDebXkqKp=Gb_8 z6g=to(GM<*2a#|vHlDr_Zm4haWNmhq@gNdzm{MQZSQp*Du+=L3iea&Jk&R^Qq-1dTKMq{+OKBs%4dT4B}c(xBGL&rYK{=#k{iQzKqQ6LXyJ+3RR( zV#q7Wx96tVD`~D8@yf*16w6*oQ|*;B$+-J6HpV_W`X1n)EL)>SMYo9r;edf6LNkiOc zu4|vUu6^dZ_en$CXTY`3fNP%t_daQe`^ebNy3 zNxww>eGYc-lZLp@A@<6UdL|rVuMDdvyCKfXh#vCF zsG2*}wQ{IyB>3Mm2;#!Ck>sPUTUBrXrMLCb(Gp}rXGqZ zv1*_+ptQ~)l?I8V)Ignic1!YDyed(jhmtx|lMR%HiLFrsb>=1-C`{!B>P$^GP#RJ- zi3aM-RU^)c4b+*MY@jrxitM@6K%Kd2r1oe}3L)Ic59UP%oUrg8(NVWKN? z1EpbNpVUB|x%NtGpfHsis58~h$qkf-iG5N7b>`YDse!^&ZlKOodnGqe8YcEh4b+)y zucQVFQ@MdUQ|*=9Kxvrxc~S#)=GrT%fx=X7pw3i#B{xtSCiY1U)R}9qqy`F8xq&)U z?Umd>X_(k2HBe`+y^`YDse!^&ZlKOodnGqe8YcEh4b+)yucQVFQ@MdUQ|*=9KxvrRCpA!KuDy~PC`{!B z>P)p)as#DdVxQDNow@c(YM?Nc8>lnYUdauVhKYSr19j%wE2)9PRBoWoRC^^iP#Pxo zNe$GQYpor%Mf#M)VW2Z%l5WG^8IxV#q5Kw=FeL8YOO9YM?Yq z+_v06X_&Zexq;G<4iyb;qZVp)`@8HHt3CXJbVCMTgj$#FJ}#ACrSee?KHlMJY?>UR zjypNbUn2Y^>b2M~ztnmQ`qxdSqXFHSi+xLH(?OQZ9$!{LY2D;VQzlJl z3g+ebvQ}kSnf8&OMb>J*&X-PK>*9-N`*JOgsE8&y^fIv@{f-by9P;qf;Tk>|nXI^!#nnGcg^#D9E*s1NCqTR86QLuPs{FY%Sr~x75BSmybtTG$Ybv zj|a6iH#K`!&sH^XdcIy|4~y({@Z|r_9)|2;JA0Vw!|dULzO#p0JL`Gx&Y?6q+^6>L zOZgA!Bal8~r;mvAk$*`aQR$;%^FBJD^?&a^3hASE`lv`B{g?Dnl|ClZr~QZYF-RY? z)5k>m*uSKYsr1z{efob$Uk&N2?ex_mef7VjuU6@6WcrN%kiG`e*VyT6MEaV4NnfMV z*UI$${zLj&NMCEGuNCQQ|0R7brBCChGMPT$q)$9~(61HraCeU1y00t9upjbt!H;Xj z$%nBo&&|>A8V2WF*C%H@F7w?S{Q_ce&UJlq#^a0*0rTT5u`&9s#NeFk`s9qqO@W)E zUsVjwxvo#ncpMCHbM*U*!8zCU$r<kw2 z?9SZg`Y^rKLT{`1Q|Xw0;Iz?nZ{jy$YJJo6A^*mvSaafT>Z3;|HK*)I2K4em@T#0T1$*YLAr~iPT5wD0@E7OpP?hCKl54XsD%-4mQ^{)Oq6; zU)kEZa&X2pdq-4}Q)PB2(pVP^76rKu=dGjkf{8CgTB;97>GpNawpK)f!QdPYJscLz z>CWn!?Mvaf*ojj)E^*>Cj!T_5o#Qem&fvJ*iTiO};ly5!E1fu#<0>ciaU62uERMrY z?B_V*#MvB2oj8Z%m=ou6T{*fH3`U@#8R`qYov8sO*$EyC( z9IN`raIEUzj$>8-_8hDFci>pnzaz)0{+&2h_3zBFs(%-bRsFkitm@y5V^#lHj#d5R zI9BxsDK1g<7jdlWFXmX)U&67fzm#KDe;LQB{&J30{S_Rm`YSnB^;dDM>ffDXRsS9w ztNQokSk=E5$EyClIac-W!?CJ=Uy4gr{UMH3{b7z({Sl5;{ZWop{V|SJ{nZ?+`fE5= z_1AK&>aXKi)jytNRsRHzRs9n=R`u6&tm<#zSk*s?V^x16#bv7g$sDWtn>beWH*>7& zZ{b+gKZRpe|9%{+`loWN>ffJZRsR7TtNIV*Sk>Rkv8sO>$EyB=I9Bx^%(1G!jbl}R zJH_Ry{tk{+{nI&C_0Ql~)jyMCRsSrGRsDx>tm;3MV^#lbj#d40I9Bz~{v$b7^~Wi$Q1u_hv8w-Qj#d5hIac*A;8@kakYiQv*>OX~JRsRZ(RsE-Otm)O1GdNcDpUJVR|16GG z{by5LrRrb9v8sP9$EyA=j#d5VaIETI$FZt^J;$p4b2(P^pU1JP|9p;B{TFbo>c5a< zRsTgCtNJhISk-?C$EyBIIac*|QyfzDZ{S$fzma2A|79Gj`g=H5^o`{RU(d0s{|1g#{Wo%~>c5HNu&V!Nj#d4)aIEUT zm19-^Z5*rmZ|7Lme+S2^{yRBV_20#@s{d||RsHvHtm?m)V^#ls9IN{8=UCPM0LQBS z2RT;tZ=yJ&>VJr1RsX{rtNI_|Sk?b1$EyCvI9ByP&atZh3653$Pjam4e~M#O|I-|+ z`k&!g)&DHVs{ZFVR`oy6v8w+Cj#d4eDUPc8U*uTT{}RWl{+Bsc^}oWgs{d7vRsFAV ztm=QAV^#kaj#d3{aIETolVer?TO6zU-{x4={|?8h{&zW6^}olls{eh8W2*iSI9Bz4 z$g!&bBaT)5A9Jkg|Ab>z|EC-NuG#e7#fnG~|NhSdk3FCr@F2w=&=z=* zY7b}+JV>(#vIflZG#8>>;dhA2VQ$X8{t8wJ)oWNz-JF=D?G@u2ecO+ z`0W90h6ma9fOf-!9D6|9;X$rFQ2Pn+fL{>sck=9k+E2bcD4tVLn?a{4g)&=5PaBt( zIFE~8)bWcoKG#TIO)sqCR(to*F8K|9xfb{3(m6)PcP38gX)mZx=a+E*Es;l3B=qSQ z)DDa^M;g5UvJG#fAvQHXr8jQPh4{r2X`e|A^9XWfjf{&Zz~ ze1=SFZ&_YRFG0Hpt&`W%i_jUDcV~8W_64Ptk6TsSGEr%NdvrF1Qo)4S_Z zqJv0DDI-Hl87O6Fse;~Zml7SVO-lXxNvR)7{j^j`cMvJjiN;CE>y?rhC9jsM>=SC; z_kv82GVS+&=x&<)*=3@XsihFVyCZIKA4oo*tjULxPfKBbk4Q*aAW_fZZ$nL4C}n9W zLhs&7$q$m>KF=8?KT3WrMd{sqDP@C{oh@t1Mk!lMF?x4jN;x3qZx<3BrB6zO21#iUN`tgi zNoOBOX)s8G2TN%%N`tjjMQ0;OX$VL|hDd1$N<*|1qSO1NG!&$vL!~qnrJ-61)7c7A z8V1s^VNx1~(l9MW=Vil!~=fQesLaAeEFzsRX4GEtQsj4Wu{aHQdyal%1|oPQhB*4 zm4j4XE~Rpm%C%HcVM-MsRa8i+0;LKqRaTl(B}kQ(QmRC$QcG1;rc?z|Rh5*gP^!{W zXm?ZE9i-iNm(uPi?XIQp9;UPhNPFxdr9DvELral8O=(Y%_S{oSd!n?bmZE!^(q16# zwU?CkLTN88#r8I(y+PW0Zz=7K(%xFC-p7>o0coFoq_hu8`y{2(;J&7`FG&0DE2Vu= z+E+_OAycArz>?2Tp^%h9D223C95y97{VOSj!&2h2GLy%j!dfbcm=c}&m6Rg(fAz-a zOg_OfDMhqY8Z{+4=_@Hkqp~JGS28I@wNw@}B|6_LDaB$^;?o|JQcO$b)uu$JdL^Z5 zI@^d|w87C3K7%nSRcooD#+2wRucTB{BPBi=F)7t(sj}9T=mf8%R9h=0KCdt-)oQ7# z&Xnpvs;iSy9ZGdt3XM0V@gR*KFQxG)jn`6mf+(iD)UOp($Ql%{B@d_Pm#52XF}lhS@D?Wd)R zsirg)q^VP-G!><(TB_XNl=cT{|NW)3KT7*+sp@}s(1E6OAV>!u zD5V2YI#5gDR#R#PskK!~ttho>DKgEJrhznVnv|xYG)+sPdBCMAWfexrRgY5*HXz0Qm&6y*mIVjE1QfRIz%>`-hTq(^(X|9&S^Gsjln&QY>>QamoDI7)FX6&+bj&eQ zItHa9VeyZP&!UaRf|k%5lD*`Nof&Ei?kFv z-jt39>GSItiqcPLk3|D4mp)DuYW+X(>ocmr7|VN=vm= zw9J&2fwXLyl$N2iOiRU`rql^iXQz}pQR>uE$#PR#4$|`FQd*AEaxImfY)U7Cbn?kk zIvJ&twN!SBDV+k+DW^#36qHWUQuzu~S^?6E6;fJ((h4nAoN7v^f^_PsQaTl-Q?*pN z(v(($v~s1CR-&|0OI52(X%$GTR!M0UN~^RKT5U?JL0Y|9N~=*?t)=j3rgR!er=2FH z(@;81OOew}>2#1zKV3?vqjb8KqGy=W86cf;hLp}g=?pE!&NQVnK|1qHDV>SZnOdqo z%aqOn>8!J)bQVfyC8et1*`{$Ft9 z-jvpZw0^ym)}ypuOBLsu(zzg=d#;quMd@5ERi0-`=Ye$Ic~UwLrSr5@b-pQ`57PPP zOX+-+&eu}t0#mvGqzf*P(gi48pr!DIrgR}l7hWi(3sJgIOOcCA=^~IWx=2bFp>&a! zq8FRe#UNdLv6L=G>0&L#E-|G`K)U1-DP4lnC0eS!)RZm->C#K3bSX-gCZ$lY+myON z>h6|OH%i@FD%xO58$jByK}s7?+MuQ4ji$5_q>US;v=OC^S}M8Blr975vdg4&8A_LF zskFzGdO+&wkx~yzJz6Te+>|Z{>GI2^bU8|wYpMJSQ@R4AE3S~z6)0VyrHU&}=}M5U zyi!V6qI9K}Dz7r7t3bNyDk)us(p6fjy4sYk2I=anrF1n)S8FMBjVWCN(lyse=^B)- z(Ng$YQ@R$UYp<2kwJ2SyrO0)rbR9_7T_>gMP`XY_(d$j=dXTQaUP{-abiI~hH<;25 zAl-0-lx{%j1}#=_ZtJ(o)gQrgSq%H{UF! zn^C%1OU1XC(k&p}a*LF1LFpDPmE3Adw}N!*tx~!brCYUBdYdWT2GVV}N$EC}ZqriP z?WS})NVnfErQ1=uT}$P6n9>~}-EoJM?m+1dEmhoUN_T>E=bciz6Qw(~RC$*v-38KJ zcS-3kl-FvT;?nUWd zEk*7#rTaj-?>;Hrhthpoir#NZ_k(o*{ZhIgrTeuMd%%<)0O^4Tr1Stv4``|SK~s7V zqz50A(t{{Hn3N*HO{TO7q)nTov%L3;F2DLsnPqgpC^%#9NP8^cYHyX{r2i zQ+gbv#~+u{<0w6@rHUs^=?RdYctT1~p!9^6DxWl^Cqa7hNhv*v(vw=MddifZ0_mxz zr1TU@PiZOiv?)Ce($h~%>1mXn)>8NxQ+fuZXP%MLGblZyrO30U^ejlvJ}aeXQF>NO z(dSI*Igp-vPD;6~AOkFM;&ZOHz6XrI)l+^0Fzt4ARRlOX+2l zUe;3SE2i`cNUyvirB_gTMN4I`n$oKvz51$@UPb9uEtS7!O0R+R+G|pJ4W-w#RPnkg zy$;gruS@B5lwQ|TmC%{Qg= zCQ5H=Dg2fxy#>-+Z%OGbl-|-(F}2meSiOy{)C_JErswNbkHOrFT$zM@zAH zP3c{b-hEd}@1pdsma5+~rT0L3?>#BKhthjVDHeR+l->vF{r9ExK1%Ovsptb!`T(R4 zK9JG}D1D%%;tx&fLy$iFP)Z-7^r4nYJ~E|`K>Fw-DSd>}M_MZV*pxm7>En;3^f5{w zYpLuLQ~Cs?Pd<^-Cn$ZQrSeZr=~IwC{ZvYyqV%bjDn2u%&p`U@Gbw$B(q~$#{M?j2 z2kG1!=TzcHn6K>FqzDSd;|H(H8)Yf9gO^zFA&`WB^cwN(9` zDSZdhci&0rJCwdlO4Y&dP3e1(zW-iI-=p-smWqBbr5`~0;Rh-GfYJ|ID*n-wegx^q zAEopoNG$8I^gBwwYbo@HDg6P`AAd;c50w7UQut3(`V*u-|CG|7DE+CW$X}-P7f65oC8fVm z`b$gEzfI|HkpBK#N`IsDx0Yi6n9@HW{qv8M{z2&Pmi?Eb zeZ8*#<=gAX^vRu>0n6&8)U5L*{*SC)%+PCRh-UC#aqBAs{e?IBi%rQt3q?a$4o<*1 z_zRVi_`5v3DveP&5>XGwEsNmE()60^`M$dU$G%KFTb z?#{v=2Fm|qLEXdBRTjR)EVK%;q(heSKC@)Fvt+olWT-5BiCJhBWXXUm6@6yu=g!j4 zou!}3!k3tZRza42kfpNEEM9jOuRDuZW#LQALaQK)7qV3KnI+SmCDWZHQ)S^x%tEUm zOD1Fq^_j)z&f;@t@u@6)iCJhBWbr|kaGzPS+*z{RS+Z0XzQioF3bJHDmPnsj{O&A% zcNV|O!k3tZRzVg&WQq2fCEJ}P+nps_W#LQALaQK4He`wQnI*@aCC8m5M`htl%tEUm zOAch|v$xP6#&kXN=eo1xsw{koS!fkx$<TCCYet}cfb*FT_6H2x zpSwLi%Xi1hY%9gjo!$QZfj%3`v(>+q9yN5mhd$qe{{2SZ-s(?|v+47QE$b)y1H0|- z^G7W8_Ga-^`j=w4KFZrmABpU|<8N74xxTZBKI7Z@t;yQ7_v&5fWICSHY+S}`O zhRLry<`2A%q|uF|?rQvL;-O%<^Se?uUk@Lz;d}^omh)*a_Qz`!W)x<4>`%=epVnC0 z*yP;AZiH^6K0d0$v^M!S`8|W_Bd>RwM(LYN+VV5f_}3STOWX3jX}%O+iajdh@9-`H zd*~lSYvk^gud)AV{DgZJPZt(bZ}EQ*7i1j}we{{3} literal 0 HcmV?d00001 diff --git a/tests/data/acpi/q35/FACP.core-count2 b/tests/data/acpi/q35/FACP.core-count2 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..31fa5dd19c213034eef4eeefa6a04e61dadd8a2a 100644 GIT binary patch literal 244 zcmZ>BbPo8!z`($~*~#D8BUr&HBEVSz2pEB4AU24G0Y(N+hD|^Y6El!tgNU*~X%LSC z$X0-fGcm9T0LA|E|L2FOWMD92VqjR>!otAF!NBm72Obk1 YBHITON2VDSAnpK(F*YFF1LDH~0O^Si0RR91 literal 0 HcmV?d00001 diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index e81dc67a2e..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,4 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/q35/APIC.core-count2", -"tests/data/acpi/q35/DSDT.core-count2", -"tests/data/acpi/q35/FACP.core-count2",