From nobody Sun Jul 26 01:37:48 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1781618414; cv=none; d=zohomail.com; s=zohoarc; b=Wc3hfyVyukB+SXRLKfFp4KfSKbT2p0HFPFhk8bTumr0u0WQ9xBkQK/2aGvjNcyAO5DGlKcEr8A5AjVnjdhG1F97qV1VpTskbFcu0qX+fePACF5UUTim2n3NYLkt6TgCdFxF6216NH6a/X9qQ92JmZPnx1TkraE0n8bq9byknc80= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781618414; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dRL+/V54GamePco94OeayJHfwlemtYbdo+DlCdU3QsM=; b=XotFkYy7+HfZ6CBclJdxEJz53+WYhryofgwaUFlJizjb39ugQPF6P3dmKv6oacDQPIsful7Z1DIclmiOn8jExBeOA7G/AR2zJcnDphK0/4YmgdHc9+M99QAKkR4Hw0zquddLlcjOu2vst2Jx681kewYAfxywJzmoltLcmMH/M4w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1781618414021824.1084151428668; Tue, 16 Jun 2026 07:00:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wZUKG-00054U-Qj; Tue, 16 Jun 2026 09:59:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wZUKE-000531-Qz for qemu-devel@nongnu.org; Tue, 16 Jun 2026 09:59:34 -0400 Received: from mail-lf1-x132.google.com ([2a00:1450:4864:20::132]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wZUKD-0007Ke-0J for qemu-devel@nongnu.org; Tue, 16 Jun 2026 09:59:34 -0400 Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-5aa66893e9fso5982198e87.1 for ; Tue, 16 Jun 2026 06:59:32 -0700 (PDT) Received: from xpahos-osx.yandex.net ([2a02:6bf:8011:f00:689d:b3a0:c7eb:5526]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5ad2e161f1esm3634677e87.2.2026.06.16.06.59.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 16 Jun 2026 06:59:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781618371; x=1782223171; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dRL+/V54GamePco94OeayJHfwlemtYbdo+DlCdU3QsM=; b=efcVDW0jOasi/GJEmvQ/LErz7/yVeaInVPq9kj7HXXajXMwSeytGeBay8o43n8RT3+ PZBHuvAXOz/SNN3S06OKi1XDSFiWUFL2okMXPDenblUZo5uGCimqMx5pACCeFLe5U0/j BkV+G9ecIg0Z2vgMMsaGxrmsfBWQvKyteXzx9ef1i2XCf/8Gvc8zBD5LfQy9gDUxIPhc wQSlqZZNJjLukDnFSNwnRar8r4IK/NNaRk5zoWt4A1YYhlCatjhI5be03BBgQbkCWDR2 TXPeB1TXadfGPq7/j2RpKTdCP9EkklwWd0Lks2vXp+drpLoNm8OIJ0eCpMzKu4aWkio7 pUxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781618371; x=1782223171; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=dRL+/V54GamePco94OeayJHfwlemtYbdo+DlCdU3QsM=; b=qvapKK3fzRl7a6fsKZPTnUYxsWQZRjbDcaclxPuFYGY91QAPkKehQI+POBEatdjURF MTswFjN3jNNKsC54i87SMPEXOXz8U7UW15UZoO7I9lPHRx02FWWd2a6zlaA9ZbfUMuE2 Y7wASzmWCbpOwK3kS+ZXvwa4sy7GEeu8fV5biOegdCorfTHGvHrstXkuYady8tsFl4sd eLgHEMk3jvj+0t4pvIAOvD7lernqjgeAPSBrzYF/IhvTgELhR/f5BW/T+/pn5ou8H0cP OavHtI/WiF+ihE6rgIuiPD8NLQ5CKlx90/k1x0wbHBSXBRlkY8KnWgBRDRbRCbSfxWIS QdVA== X-Gm-Message-State: AOJu0YziDHF/qyG7rBic2v0vUuSbcy+ueoapsK+cVAtm0sAubW33aWwt +52jiur87PTTrieERPzVpuZ/gOa06GjuER7ph49XhVvmQxqlaRqUy9etw84cgrcfX9I= X-Gm-Gg: Acq92OHF6gRhMOvhLn+FU9BgVTAzteWyPMnYDoSXS4S2lYDUj/64K5072f9OkI5H/S1 smUy+r8NDYPyj5H6seq/ZLoBty465W/FzmxuX2KqE2i3VdLm2+zeaytH67YjnXfdlKZa/It6mTT hjSyTKkOX2w5lXs2DHDyiTMWvJZoBa6VDK+s3eHi4eKyl5cZK2DwyHNdXqWd87k6CSPgaExkQB1 zw74PZM9TPFUj9H+MK2lG+yDJ9q4zcSs5QErnThgro0dacSlv/DagzdW9guRkxXUhnTxfgFEiQZ JOSu5QPKW/p8hdvSS6HDE5fy5yHNSqGZylh732LbQ5zI5g6qeLm+hnNp3MWIxbkH0TN/Z2bGEhb 2ZwVGRW+i57/Ah61B0PqtRO5wDQVRyQ50AGwt8eM7pSYTamhYvrpEzCduDWnQ5BEs5m/Jbn3vIW 4NYuh0yRZqBjrIGiO4mAc9suf7/GEsMZiKZKXWXHSnrbLAvANpIxXZxxmltog= X-Received: by 2002:ac2:57c3:0:b0:5aa:8823:aeba with SMTP id 2adb3069b0e04-5ad4376a746mr996661e87.47.1781618370863; Tue, 16 Jun 2026 06:59:30 -0700 (PDT) From: Alexander Gryanko To: qemu-devel@nongnu.org Cc: imammedo@redhat.com, mst@redhat.com, philmd@linaro.org, anisinha@redhat.com, pbonzini@redhat.com, richard.henderson@linaro.org, zhao1.liu@intel.com, Alexander Gryanko Subject: [PATCH v2 1/3] hw/i386/pc: Introduce 11.2 machine type for SMBIOS type 8 base migration Date: Tue, 16 Jun 2026 16:59:02 +0300 Message-Id: <20260616135904.44930-2-xpahos@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20260616135904.44930-1-xpahos@gmail.com> References: <20260616135904.44930-1-xpahos@gmail.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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::132; envelope-from=xpahos@gmail.com; helo=mail-lf1-x132.google.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FORGED_GMAIL_RCVD=1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @gmail.com) X-ZM-MESSAGEID: 1781618416672158500 Content-Type: text/plain; charset="utf-8" SMBIOS Type 8 (Port Connector) tables have been using T0_BASE (0x0) for handle allocation, which can collide with handles assigned to other SMBIOS types. Types 2, 3, 4, 9, and 11 already use dedicated ranges (T2_BASE=3D0x200, T3_BASE=3D0x300, etc.). Introduce pc-q35-11.2 and pc-i440fx-11.2 with smbios_type8_handle_t8_base enabled, so Type 8 handles start at 0x800. The 11.1 machine types retain T0_BASE for migration compatibility. Other platforms (ARM, LoongArch, RISC-V) are not changed by this patch. Signed-off-by: Alexander Gryanko --- hw/core/machine.c | 3 +++ hw/i386/pc.c | 3 +++ hw/i386/pc_piix.c | 16 ++++++++++++++-- hw/i386/pc_q35.c | 16 ++++++++++++++-- include/hw/core/boards.h | 3 +++ include/hw/i386/pc.h | 4 ++++ 6 files changed, 41 insertions(+), 4 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 63baff859f..96de2d20f0 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -39,6 +39,9 @@ #include "hw/acpi/generic_event_device.h" #include "qemu/audio.h" =20 +GlobalProperty hw_compat_11_1[] =3D {}; +const size_t hw_compat_11_1_len =3D G_N_ELEMENTS(hw_compat_11_1); + GlobalProperty hw_compat_11_0[] =3D { { "chardev-vc", "encoding", "cp437" }, }; diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 2ecad3c503..17ad8b6489 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -73,6 +73,9 @@ #include "hw/xen/xen-bus.h" #endif =20 +GlobalProperty pc_compat_11_1[] =3D {}; +const size_t pc_compat_11_1_len =3D G_N_ELEMENTS(pc_compat_11_1); + GlobalProperty pc_compat_11_0[] =3D {}; const size_t pc_compat_11_0_len =3D G_N_ELEMENTS(pc_compat_11_0); =20 diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 82457bdb16..27e1d552f6 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -406,6 +406,7 @@ static void pc_i440fx_machine_options(MachineClass *m) pcmc->default_south_bridge =3D TYPE_PIIX3_DEVICE; pcmc->pci_root_uid =3D 0; pcmc->default_cpu_version =3D 1; + pcmc->smbios_type8_handle_t8_base =3D true; =20 m->family =3D "pc_piix"; m->desc =3D "Standard PC (i440FX + PIIX, 1996)"; @@ -428,12 +429,23 @@ static void pc_i440fx_machine_options(MachineClass *m) pc_piix_compat_defaults, pc_piix_compat_defaults_len); } =20 -static void pc_i440fx_machine_11_1_options(MachineClass *m) +static void pc_i440fx_machine_11_2_options(MachineClass *m) { pc_i440fx_machine_options(m); } =20 -DEFINE_I440FX_MACHINE_AS_LATEST(11, 1); +DEFINE_I440FX_MACHINE_AS_LATEST(11, 2); + +static void pc_i440fx_machine_11_1_options(MachineClass *m) +{ + PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); + pc_i440fx_machine_11_2_options(m); + pcmc->smbios_type8_handle_t8_base =3D false; + compat_props_add(m->compat_props, hw_compat_11_1, hw_compat_11_1_len); + compat_props_add(m->compat_props, pc_compat_11_1, pc_compat_11_1_len); +} + +DEFINE_I440FX_MACHINE(11, 1); =20 static void pc_i440fx_machine_11_0_options(MachineClass *m) { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index d8fed698c7..cf1ae9b78b 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -345,6 +345,7 @@ static void pc_q35_machine_options(MachineClass *m) PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); pcmc->pci_root_uid =3D 0; pcmc->default_cpu_version =3D 1; + pcmc->smbios_type8_handle_t8_base =3D true; =20 m->family =3D "pc_q35"; m->desc =3D "Standard PC (Q35 + ICH9, 2009)"; @@ -365,12 +366,23 @@ static void pc_q35_machine_options(MachineClass *m) pc_q35_compat_defaults, pc_q35_compat_defaults_len); } =20 -static void pc_q35_machine_11_1_options(MachineClass *m) +static void pc_q35_machine_11_2_options(MachineClass *m) { pc_q35_machine_options(m); } =20 -DEFINE_Q35_MACHINE_AS_LATEST(11, 1); +DEFINE_Q35_MACHINE_AS_LATEST(11, 2); + +static void pc_q35_machine_11_1_options(MachineClass *m) +{ + PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); + pc_q35_machine_11_2_options(m); + pcmc->smbios_type8_handle_t8_base =3D false; + compat_props_add(m->compat_props, hw_compat_11_1, hw_compat_11_1_len); + compat_props_add(m->compat_props, pc_compat_11_1, pc_compat_11_1_len); +} + +DEFINE_Q35_MACHINE(11, 1); =20 static void pc_q35_machine_11_0_options(MachineClass *m) { diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h index 29c68931d8..a436d48c8e 100644 --- a/include/hw/core/boards.h +++ b/include/hw/core/boards.h @@ -815,6 +815,9 @@ compat_props_add(GPtrArray *arr, } } =20 +extern GlobalProperty hw_compat_11_1[]; +extern const size_t hw_compat_11_1_len; + extern GlobalProperty hw_compat_11_0[]; extern const size_t hw_compat_11_0_len; =20 diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 85a74363b5..b7d21fb96e 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -102,6 +102,7 @@ struct PCMachineClass { /* SMBIOS compat: */ bool smbios_defaults; bool smbios_legacy_mode; + bool smbios_type8_handle_t8_base; SmbiosEntryPointType default_smbios_ep_type; =20 /* RAM / address space compat: */ @@ -208,6 +209,9 @@ void pc_system_parse_ovmf_flash(uint8_t *flash_ptr, siz= e_t flash_size); /* sgx.c */ void pc_machine_init_sgx_epc(PCMachineState *pcms); =20 +extern GlobalProperty pc_compat_11_1[]; +extern const size_t pc_compat_11_1_len; + extern GlobalProperty pc_compat_11_0[]; extern const size_t pc_compat_11_0_len; =20 --=20 2.39.5 (Apple Git-154) From nobody Sun Jul 26 01:37:48 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1781618435; cv=none; d=zohomail.com; s=zohoarc; b=cLUuq7iA6BBJFJF9mBA7Hjg3Tg0/u2fxmYYVgDfDfHcOri6EtEWDDgKS/ogcPk3nIHjGUbdLccR/Ly78kkcs278tqTNozGt9yfVFPPmGUAfM6gFinzYWB9C0p4NIytB+JV5+jTgQOYWlgUwNBrwFJez52F4lXxQFmmGOg4ICSdQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781618435; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=1843k24ZTU4wUi+EnwW19oLLlgWrWeA2MiXCiM3L90o=; b=czBvlKr5Sb8pZEjRkidWeCwqrvH6uWI9S4r0X8PCIcQw13hDy6CrnDoXfYRGxmnahwQzdpg7fz2PR3L+lB2XW10JTUtxVabkHHkMYv+h8S5xeThE9BT06Otuc1W4Jj39FgWaYcfI2wyKDhY1AQ6E062MKPQsJxsCBTEdlSyJAKo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1781618435146253.53061907488507; Tue, 16 Jun 2026 07:00:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wZUKM-00056Z-Mh; Tue, 16 Jun 2026 09:59:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wZUKH-000555-3y for qemu-devel@nongnu.org; Tue, 16 Jun 2026 09:59:38 -0400 Received: from mail-lf1-x130.google.com ([2a00:1450:4864:20::130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wZUKF-0007M5-Gi for qemu-devel@nongnu.org; Tue, 16 Jun 2026 09:59:36 -0400 Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-5aa68dbd44fso4536519e87.2 for ; Tue, 16 Jun 2026 06:59:35 -0700 (PDT) Received: from xpahos-osx.yandex.net ([2a02:6bf:8011:f00:689d:b3a0:c7eb:5526]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5ad2e161f1esm3634677e87.2.2026.06.16.06.59.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 16 Jun 2026 06:59:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781618374; x=1782223174; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1843k24ZTU4wUi+EnwW19oLLlgWrWeA2MiXCiM3L90o=; b=Yr7+kIb4MJ6WRFjfKSlSbjaFX2cHewz25DYi7XDFuxynTuso2D4dCWqNpFrwKRqsbd OrPfVgIBmJKoQ/BwNl+EopEasZ/BVClFGNMKwMO3Mm5G4gBIIauGs/wSHGTst+xxeX/Y UEhvUYW7lCYVWbfCTJt/DXu2j9jCBNfwHYwnh7P5ghfhQ3ocPHIuk1SqyD0Mlm8CO+3X KkMyLYy0C8Lmt/QHkOPput4H4mRAZFgYHugKshne8lldfTziKuVyof9c1Fn4fOx237pU b6kZe9koskCAkxGFrZg0TkLybw+dvNRX2ESxocbnia4KOpN3kt/vYr6X+CtAeEDRAdBF EHGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781618374; x=1782223174; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=1843k24ZTU4wUi+EnwW19oLLlgWrWeA2MiXCiM3L90o=; b=WTeMJUQCzvc3vKLRrNR3vlcQ6JPAAWpBUfPJpx5FWzDH6HqNJfWT39NN8sQFUGHy9b h3aL1Ca27X4uu9CBUK2s2SQwFAAZjF5VnbpryFfTftpMcBAFdQsVTTGtf5UuHRQWyrxj CBz85sUKcKFCa/62DSFNOcInE4qBwTITc4hQpMkVFxW+vJGK5ONN8wkDl21JWK/7YfeN vm2mlh8p7nX3zFkgk9k9P5zSoWmD3eB7d6Q8PiyQhFpHahV6KyvZuv7kQ23lZfLyDIW1 RDLsn0O/CVGYVWTzMaagZVwhx8eM9rnG/MhW+qjdkZkEqnPIFM1DLu+5dPgWg7lomioC j4DA== X-Gm-Message-State: AOJu0YybnG1w04y5cnhNFMbSLcS6yvQBhdRxVCFR/cnIajGgIq1B2woT 9pglP67lx//BepYl47+rWybmy4ETnhRGRIEemdrQOkwEdRfG6a++Oqdvtqlzcb6KF/k= X-Gm-Gg: Acq92OGCFmL5Y839sS7HjOq65UqnkpTivx5c0sGuHRk7lkWCLTjShfQu4YHYvk6TE2n aJw6wnIJbrdDZZxMngYB04xogPIYQ79X5oSX5JMTVgwRUYG5wrE907sOwxk7Q/61FYEtEbGvIQh 46YqH7mMrh2IjP36eN7p45w7TofX+le8imiYRY4HXpxrLw8HKZ9qlLaKKrSsb2yFzHIfoMIVxl3 7en8/fOCa/M3FMnILCbhUGd1B8fEPqLk0ZlyLIm2m2/XkPNwI0JqxFh0urdDL8b9QhhCm6qciOy 6171R0iZ/CMsAWPx2YZpn3cI60T/qzAAmuLU6Vb4+F5yMzcr4vFdU5AK5k/M8Rw1E/jyb/RPZe/ h4A59W9rJGYe972i2JoNKo5n+6YrZr7ya1NlpKHvMy/oCxMTOgjbN0fJFKbKLT8x7cDx654H2EX w+y/RxedckO0hUCNtl0SnDaK/lof+G8JOFHVQv/VZGwM6RKneH X-Received: by 2002:a05:6512:1253:b0:5ad:3a70:a8cf with SMTP id 2adb3069b0e04-5ad3a70aa46mr2694319e87.25.1781618373567; Tue, 16 Jun 2026 06:59:33 -0700 (PDT) From: Alexander Gryanko To: qemu-devel@nongnu.org Cc: imammedo@redhat.com, mst@redhat.com, philmd@linaro.org, anisinha@redhat.com, pbonzini@redhat.com, richard.henderson@linaro.org, zhao1.liu@intel.com, Alexander Gryanko Subject: [PATCH v2 2/3] hw/smbios: Add dedicated handle range for Type 8 tables Date: Tue, 16 Jun 2026 16:59:03 +0300 Message-Id: <20260616135904.44930-3-xpahos@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20260616135904.44930-1-xpahos@gmail.com> References: <20260616135904.44930-1-xpahos@gmail.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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::130; envelope-from=xpahos@gmail.com; helo=mail-lf1-x130.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-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: qemu development 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 @gmail.com) X-ZM-MESSAGEID: 1781618437010158500 Content-Type: text/plain; charset="utf-8" SMBIOS Type 8 (Port Connector) tables currently use T0_BASE (0x0) for handle allocation. This can lead to handle collisions with other table types that also start at T0_BASE. Types 2, 3, 4, 9, and 11 already have dedicated handle ranges (T2_BASE=3D0x200, T3_BASE=3D0x300, T4_BASE=3D0= x400, T9_BASE=3D0x900, T11_BASE=3D0xe00), but Type 8 was missed. Add T8_BASE (0x800) to fill the gap in the handle range allocation. Introduce a static flag and smbios_set_type8_handle_t8_base() setter to allow machine types to opt in to the new range. When the flag is false (the default), the old T0_BASE behavior is preserved. Signed-off-by: Alexander Gryanko --- hw/i386/fw_cfg.c | 1 + hw/smbios/smbios.c | 10 +++++++++- include/hw/firmware/smbios.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c index 2876490f06..0b3a14cdb1 100644 --- a/hw/i386/fw_cfg.c +++ b/hw/i386/fw_cfg.c @@ -77,6 +77,7 @@ void fw_cfg_build_smbios(PCMachineState *pcms, FWCfgState= *fw_cfg, /* These values are guest ABI, do not change */ smbios_set_defaults("QEMU", mc->desc, mc->name); } + smbios_set_type8_handle_t8_base(pcmc->smbios_type8_handle_t8_base); =20 /* tell smbios about cpuid version and features */ smbios_set_cpuid(cpu->env.cpuid_version, cpu->env.features[FEAT_1_EDX]= ); diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index 7d7141851b..0e0200600e 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -49,6 +49,7 @@ static SmbiosEntryPoint ep; static int smbios_type4_count =3D 0; static bool smbios_have_defaults; static uint32_t smbios_cpuid_version, smbios_cpuid_features; +static bool smbios_type8_t8_base; =20 DECLARE_BITMAP(smbios_have_binfile_bitmap, SMBIOS_MAX_TYPE + 1); DECLARE_BITMAP(smbios_have_fields_bitmap, SMBIOS_MAX_TYPE + 1); @@ -553,6 +554,7 @@ bool smbios_skip_table(uint8_t type, bool required_tabl= e) #define T2_BASE 0x200 #define T3_BASE 0x300 #define T4_BASE 0x400 +#define T8_BASE 0x800 #define T9_BASE 0x900 #define T11_BASE 0xe00 =20 @@ -742,13 +744,19 @@ static void smbios_build_type_4_table(MachineState *m= s, unsigned instance, smbios_type4_count++; } =20 +void smbios_set_type8_handle_t8_base(bool t8_base) +{ + smbios_type8_t8_base =3D t8_base; +} + static void smbios_build_type_8_table(void) { unsigned instance =3D 0; struct type8_instance *t8; + uint16_t base =3D smbios_type8_t8_base ? T8_BASE : T0_BASE; =20 QTAILQ_FOREACH(t8, &type8, next) { - SMBIOS_BUILD_TABLE_PRE(8, T0_BASE + instance, true); + SMBIOS_BUILD_TABLE_PRE(8, base + instance, true); =20 SMBIOS_TABLE_SET_STR(8, internal_reference_str, t8->internal_refer= ence); SMBIOS_TABLE_SET_STR(8, external_reference_str, t8->external_refer= ence); diff --git a/include/hw/firmware/smbios.h b/include/hw/firmware/smbios.h index 3ea732f4e6..62e728b69c 100644 --- a/include/hw/firmware/smbios.h +++ b/include/hw/firmware/smbios.h @@ -333,6 +333,7 @@ void smbios_set_cpuid(uint32_t version, uint32_t featur= es); void smbios_set_defaults(const char *manufacturer, const char *product, const char *version); void smbios_set_default_processor_family(uint16_t processor_family); +void smbios_set_type8_handle_t8_base(bool t8_base); uint8_t *smbios_get_table_legacy(size_t *length, Error **errp); void smbios_get_tables(MachineState *ms, SmbiosEntryPointType ep_type, --=20 2.39.5 (Apple Git-154) From nobody Sun Jul 26 01:37:48 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1781618410; cv=none; d=zohomail.com; s=zohoarc; b=e4fi3EDUe6jaYbwYDWy9X8N9KsejHQvdOS+Y8We3zyhb2PLgd7cO1puSI8hqwuXP8b78Dwx7qsi/S2hMTYgP5gVTkijqKqVJLToqIiBbGFaeVga0AIHRCnFb9Z6YS/bLtg9zvIVOSM9vAY/mLnJkE/4Mk+0xouAI7mIxIv0XYu0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781618410; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=YkszgkRrL+lmmUAapTwwBv/OpmRR46GIrD5NRqmSiUY=; b=OYcFT2+LQBHxJxJuQXAk7V1M9aW6FlTokkrphR9+KZ7HbkQ/FaE7PpWJ/R6G771WR7Po9gkBXMl4QeSY98XyqbAAKn32qm/s9Q6K0kZ3xcI/eWRQpS/t615HjJ9De5tYZK+N46VJggRy90HYjfTbiidAvVmp6zqbCMmWLSDx0ls= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1781618410204105.4629486628794; Tue, 16 Jun 2026 07:00:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wZUKP-00056v-0E; Tue, 16 Jun 2026 09:59:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wZUKL-00056R-IN for qemu-devel@nongnu.org; Tue, 16 Jun 2026 09:59:41 -0400 Received: from mail-lf1-x131.google.com ([2a00:1450:4864:20::131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wZUKJ-0007MS-Rm for qemu-devel@nongnu.org; Tue, 16 Jun 2026 09:59:41 -0400 Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-5aa68d65d24so4190006e87.1 for ; Tue, 16 Jun 2026 06:59:39 -0700 (PDT) Received: from xpahos-osx.yandex.net ([2a02:6bf:8011:f00:689d:b3a0:c7eb:5526]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5ad2e161f1esm3634677e87.2.2026.06.16.06.59.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 16 Jun 2026 06:59:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781618378; x=1782223178; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YkszgkRrL+lmmUAapTwwBv/OpmRR46GIrD5NRqmSiUY=; b=Ym6tQIrhD6YzmnzMCMnFhSe1t6Ma9Z8l5kxzjPuIp1Ax4C8a7joCC8FjRdbrYvyjtl LKj9qaTYlB9JPEZtQgM1M4qSvMiqrPk8K9RCxFkXEN4vkqNFu1pl2s6RsGjMk7KMRroC /1s1bMbtIIsOSbEBtbYUiJrotHTjWbSsDq+WXq2E7UtDWepAMeg8d9j138rdf0j6dDib hy2IqoeZbNaXjVEykfmSpPSypWiwhwM9ZYOuDqN3JNO1xAML/Pfgn8hCUIzvJJVoFqwH oT+v0izKoxkz/wlCJNfnNGyV9RUQluhgnb8vzSFTBfGofBfn83svwP75PmdTR02xiisS W5eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781618378; x=1782223178; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=YkszgkRrL+lmmUAapTwwBv/OpmRR46GIrD5NRqmSiUY=; b=Cn0nN2zLjq50GVWAKOrNHJLy4UCAfMwaILMma+QAw+8gipUKz1ROBON0bSWhGJaicz BmVpxmx9koW/eO2TEg3c0uwCceFt3CifOafTescaDZlC3N9cu9ShKU5ydFn37pSV8Qdi KEzireQqYqChoHnMI8VdINmWoJ86qPMZAqGAxStLDz9ZL+LjTqns04zkZDCc0h1poBw/ 4bdk3h3wb0PgSPVXpcikURMJKdqOLgiQ+kz+nop1QJ4Y9338818POycAZl/ikNugSBkC bUfCrboHg7OOBmYJ7KRS6NFGPkSVuU/j7E4+gCEJJcfvh+Tk8YanUY0Km17qWN4y7o5x UcYQ== X-Gm-Message-State: AOJu0YywblQpwYIVDgEXa/1G3PPjZihQ3K0T/N4zy8H833Y7h4rsuZEh 0zUCzsmUS6moehG3xw1hYERZ+2hGdEdFLAcCs4lfrsHyi3PEiqmJ4fHJa+VICNRW3FI= X-Gm-Gg: Acq92OELiUesxuRPAz1dzdzC2BEtnfLIpFr9r+sqWvTZ5cOE6VQqSZtkl6LW3gGbU49 cduJXjhjKiI6XBhjr1mXk3d3rqyHEj5qWX8UtHpVo4Vql9aIT5ijAD4z0BB2BXV+CY4PvmtczTX gXtVjQx1li2fLp+w3Us7pKLK6Hjco64BQJmVUo1Ji2oU2lTEmtiBFwVkx6Inh9/BrbW758BEyQz WM1qgGxETR449tZnmtu4dyF/PEgo3Kjzk6T7dtH/g28g1DLyr3gO6ka17TnXb6+N1agCwzWK+XT nyAjEr+vQ0b4X7CT2oyb1SN+jjFfzFsH/8A3LF26ctzE/UQv9CTYxvWLOJVV/WXYfkBZBOqieiG VWJLSFc83TE5JwpNCiXpTSuo2unuQm98PJmaJftzX33JWZ4W03k1Wro4MmIkatquSudXPO8WboS SJ46WafnYwp/yrbIuZ/aome1xIk2FE718LZl3mgWqjL6bZTsnW X-Received: by 2002:a05:6512:6c9:b0:5a8:886f:c03d with SMTP id 2adb3069b0e04-5ad4277814bmr1443808e87.19.1781618377634; Tue, 16 Jun 2026 06:59:37 -0700 (PDT) From: Alexander Gryanko To: qemu-devel@nongnu.org Cc: imammedo@redhat.com, mst@redhat.com, philmd@linaro.org, anisinha@redhat.com, pbonzini@redhat.com, richard.henderson@linaro.org, zhao1.liu@intel.com, Alexander Gryanko Subject: [PATCH v2 3/3] tests/qtest: Add SMBIOS Type 8 handle base tests Date: Tue, 16 Jun 2026 16:59:04 +0300 Message-Id: <20260616135904.44930-4-xpahos@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20260616135904.44930-1-xpahos@gmail.com> References: <20260616135904.44930-1-xpahos@gmail.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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::131; envelope-from=xpahos@gmail.com; helo=mail-lf1-x131.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-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: qemu development 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 @gmail.com) X-ZM-MESSAGEID: 1781618412472158500 Content-Type: text/plain; charset="utf-8" Verify that SMBIOS Type 8 table handles use the correct base address depending on the machine type version: - pc-q35-11.2 and pc-i440fx-11.2 (latest): handles start at 0x800 - pc-q35-11.1 and pc-i440fx-11.1 (compat): handles start at 0x0 Each test creates two Type 8 entries to verify both the base address and sequential handle assignment (base+0, base+1). Signed-off-by: Alexander Gryanko --- tests/qtest/bios-tables-test.c | 70 +++++++++++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 510751799e..66d6015667 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -99,6 +99,7 @@ typedef struct { uint16_t smbios_core_count2; uint8_t smbios_thread_count; uint16_t smbios_thread_count2; + bool smbios_type8_t8_base; uint8_t *required_struct_types; int required_struct_types_len; int type4_count; @@ -720,12 +721,22 @@ static void smbios_type4_count_test(test_data *data, = int type4_count) } } =20 +static void smbios_type8_test(test_data *data, uint32_t addr, + int instance) +{ + uint16_t handle =3D qtest_readw(data->qts, + addr + offsetof(struct smbios_structure_header, handle)); + uint16_t expected_base =3D data->smbios_type8_t8_base ? 0x800 : 0x0; + + g_assert_cmpuint(handle, =3D=3D, expected_base + instance); +} + 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, type4_count =3D 0; + int i =3D 0, len, max_len =3D 0, type4_count =3D 0, type8_count =3D 0; uint8_t type, prv, crt; uint64_t addr; =20 @@ -754,6 +765,11 @@ static void test_smbios_structs(test_data *data, Smbio= sEntryPointType ep_type) type4_count++; } =20 + if (type =3D=3D 8) { + smbios_type8_test(data, addr, type8_count); + type8_count++; + } + /* seek to end of unformatted string area of this struct ("\0\0") = */ prv =3D crt =3D 1; while (prv || crt) { @@ -2534,6 +2550,50 @@ static void test_acpi_isapc_smbios_legacy(void) free_test_data(&data); } =20 +static void test_smbios_type8_common(const char *machine, + const char *variant, bool t8_base) +{ + uint8_t req_type8[] =3D { 8 }; + test_data data =3D { + .machine =3D machine, + .arch =3D "x86", + .variant =3D variant, + .required_struct_types =3D req_type8, + .required_struct_types_len =3D ARRAY_SIZE(req_type8), + .smbios_type8_t8_base =3D t8_base, + }; + + test_smbios("-smbios type=3D8,connector_type=3D7,port_type=3D8," + "external_reference=3DUSB1 " + "-smbios type=3D8,connector_type=3D8,port_type=3D9," + "external_reference=3DUSB2", &data); + free_test_data(&data); +} + +static void test_acpi_q35_smbios_type8(void) +{ + test_smbios_type8_common(MACHINE_Q35, + ".q35_smbios_type8", true); +} + +static void test_acpi_q35_smbios_type8_compat(void) +{ + test_smbios_type8_common("pc-q35-11.1", + ".q35_smbios_type8_compat", false); +} + +static void test_acpi_pc_smbios_type8(void) +{ + test_smbios_type8_common(MACHINE_PC, + ".pc_smbios_type8", true); +} + +static void test_acpi_pc_smbios_type8_compat(void) +{ + test_smbios_type8_common("pc-i440fx-11.1", + ".pc_smbios_type8_compat", false); +} + static void test_oem_fields(test_data *data) { int i; @@ -2760,6 +2820,10 @@ int main(int argc, char *argv[]) test_acpi_pc_smbios_options); qtest_add_func("acpi/piix4/smbios-blob", test_acpi_pc_smbios_blob); + qtest_add_func("acpi/piix4/smbios-type8", + test_acpi_pc_smbios_type8); + qtest_add_func("acpi/piix4/smbios-type8-compat", + test_acpi_pc_smbios_type8_compat); qtest_add_func("acpi/piix4/smbios-legacy", test_acpi_isapc_smbios_legacy); } @@ -2828,6 +2892,10 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/q35/cxl", test_acpi_q35_cxl); #endif qtest_add_func("acpi/q35/slic", test_acpi_q35_slic); + qtest_add_func("acpi/q35/smbios-type8", + test_acpi_q35_smbios_type8); + qtest_add_func("acpi/q35/smbios-type8-compat", + test_acpi_q35_smbios_type8_compat); } if (qtest_has_machine("microvm")) { qtest_add_func("acpi/microvm", test_acpi_microvm_tcg); --=20 2.39.5 (Apple Git-154)