From: Ani Sinha <anisinha@redhat.com>
To: Igor Mammedov <imammedo@redhat.com>
Cc: QEMU Developers <qemu-devel@nongnu.org>,
Peter Maydell <peter.maydell@linaro.org>,
Paolo Bonzini <pbonzini@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Song Gao <gaosong@loongson.cn>,
Alistair Francis <alistair.francis@wdc.com>,
palmer@dabbelt.com, bin.meng@windriver.com, liwei1518@gmail.com,
dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com,
philmd@linaro.org, wangyanan55@huawei.com, eblake@redhat.com,
armbru@redhat.com, qemu-arm@nongnu.org, qemu-riscv@nongnu.org,
f.ebner@proxmox.com
Subject: Re: [PATCH 18/19] pc/q35: set SMBIOS entry point type to 'auto' by default
Date: Tue, 5 Mar 2024 17:51:14 +0530 [thread overview]
Message-ID: <B21B8627-97D5-4047-97BF-963F3CA57DCA@redhat.com> (raw)
In-Reply-To: <20240227154749.1818189-19-imammedo@redhat.com>
> On 27-Feb-2024, at 21:17, Igor Mammedov <imammedo@redhat.com> wrote:
>
> Use smbios-entry-point-type='auto' for newer machine types as a workaround
> for Windows not detecting SMBIOS tables. Which makes QEMU pick SMBIOS tables
> based on configuration (with 2.x preferred and fallback to 3.x if the former
> isn't compatible with configuration)
>
> Default compat setting of smbios-entry-point-type after series
> for pc/q35 machines:
> * 9.0-newer: 'auto'
> * 8.1-8.2: '64'
> * 8.0-older: '32'
>
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2008
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Ani Sinha <anisinha@redhat.com>
> ---
> hw/i386/pc.c | 2 +-
> hw/i386/pc_piix.c | 4 ++++
> hw/i386/pc_q35.c | 3 +++
> 3 files changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 56562e7d9e..2f69dfd0a8 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1831,7 +1831,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
> mc->nvdimm_supported = true;
> mc->smp_props.dies_supported = true;
> mc->default_ram_id = "pc.ram";
> - pcmc->default_smbios_ep_type = SMBIOS_ENTRY_POINT_TYPE_64;
> + pcmc->default_smbios_ep_type = SMBIOS_ENTRY_POINT_TYPE_AUTO;
>
> object_class_property_add(oc, PC_MACHINE_MAX_RAM_BELOW_4G, "size",
> pc_machine_get_max_ram_below_4g, pc_machine_set_max_ram_below_4g,
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index ec7c07b362..f9da942c55 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -535,12 +535,16 @@ DEFINE_I440FX_MACHINE(v9_0, "pc-i440fx-9.0", NULL,
>
> static void pc_i440fx_8_2_machine_options(MachineClass *m)
> {
> + PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> +
> pc_i440fx_9_0_machine_options(m);
> m->alias = NULL;
> m->is_default = false;
>
> compat_props_add(m->compat_props, hw_compat_8_2, hw_compat_8_2_len);
> compat_props_add(m->compat_props, pc_compat_8_2, pc_compat_8_2_len);
> + /* For pc-i44fx-8.2 and 8.1, use SMBIOS 3.X by default */
> + pcmc->default_smbios_ep_type = SMBIOS_ENTRY_POINT_TYPE_64;
> }
>
> DEFINE_I440FX_MACHINE(v8_2, "pc-i440fx-8.2", NULL,
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 53fb3db26d..da3f92bea7 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -371,10 +371,13 @@ DEFINE_Q35_MACHINE(v9_0, "pc-q35-9.0", NULL,
>
> static void pc_q35_8_2_machine_options(MachineClass *m)
> {
> + PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> pc_q35_9_0_machine_options(m);
> m->alias = NULL;
> compat_props_add(m->compat_props, hw_compat_8_2, hw_compat_8_2_len);
> compat_props_add(m->compat_props, pc_compat_8_2, pc_compat_8_2_len);
> + /* For pc-q35-8.2 and 8.1, use SMBIOS 3.X by default */
> + pcmc->default_smbios_ep_type = SMBIOS_ENTRY_POINT_TYPE_64;
> }
>
> DEFINE_Q35_MACHINE(v8_2, "pc-q35-8.2", NULL,
> --
> 2.39.3
>
next prev parent reply other threads:[~2024-03-05 12:22 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-27 15:47 [PATCH 00/19] Workaround Windows failing to find 64bit SMBIOS entry point with SeaBIOS Igor Mammedov
2024-02-27 15:47 ` [PATCH 01/19] tests: smbios: make it possible to write SMBIOS only test Igor Mammedov
2024-02-28 9:35 ` Ani Sinha
2024-02-27 15:47 ` [PATCH 02/19] tests: smbios: add test for -smbios type=11 option Igor Mammedov
2024-02-28 9:55 ` Ani Sinha
2024-02-27 15:47 ` [PATCH 03/19] tests: smbios: add test for legacy mode CLI options Igor Mammedov
2024-02-28 11:11 ` Ani Sinha
2024-02-28 13:59 ` Igor Mammedov
2024-02-28 14:18 ` Ani Sinha
2024-02-27 15:47 ` [PATCH 04/19] smbios: cleanup smbios_get_tables() from legacy handling Igor Mammedov
2024-02-28 11:27 ` Ani Sinha
2024-02-27 15:47 ` [PATCH 05/19] smbios: get rid of smbios_smp_sockets global Igor Mammedov
2024-02-29 7:51 ` Ani Sinha
2024-02-27 15:47 ` [PATCH 06/19] smbios: get rid of smbios_legacy global Igor Mammedov
2024-02-29 10:53 ` Ani Sinha
2024-02-29 14:29 ` Igor Mammedov
2024-03-01 8:33 ` Ani Sinha
2024-03-04 17:38 ` Daniel Henrique Barboza
2024-02-27 15:47 ` [PATCH 07/19] smbios: avoid mangling user provided tables Igor Mammedov
2024-03-04 9:55 ` Ani Sinha
2024-03-04 14:17 ` Igor Mammedov
2024-02-27 15:47 ` [PATCH 08/19] smbios: don't check type4 structures in legacy mode Igor Mammedov
2024-03-04 7:16 ` Ani Sinha
2024-02-27 15:47 ` [PATCH 09/19] smbios: build legacy mode code only for 'pc' machine Igor Mammedov
2024-03-04 10:55 ` Ani Sinha
2024-03-04 14:23 ` Igor Mammedov
2024-03-04 16:43 ` Igor Mammedov
2024-02-27 15:47 ` [PATCH 10/19] smbios: handle errors consistently Igor Mammedov
2024-03-04 11:14 ` Ani Sinha
2024-03-04 13:39 ` Igor Mammedov
2024-03-04 13:53 ` Ani Sinha
2024-02-27 15:47 ` [PATCH 11/19] smbios: clear smbios_tables pointer after freeing Igor Mammedov
2024-03-04 13:54 ` Ani Sinha
2024-03-04 14:25 ` Igor Mammedov
2024-02-27 15:47 ` [PATCH 12/19] get rid of global smbios_ep_type Igor Mammedov
2024-03-04 17:38 ` Daniel Henrique Barboza
2024-03-05 8:39 ` Ani Sinha
2024-02-27 15:47 ` [PATCH 13/19] smbios: extend smbios-entry-point-type with 'auto' value Igor Mammedov
2024-02-27 17:00 ` Markus Armbruster
2024-03-05 9:15 ` Ani Sinha
2024-02-27 15:47 ` [PATCH 14/19] smbios: in case of entry point is 'auto' try to build v2 tables 1st Igor Mammedov
2024-03-05 6:00 ` Ani Sinha
2024-02-27 15:47 ` [PATCH 15/19] smbios: error out when building type 4 table is not possible Igor Mammedov
2024-03-05 11:36 ` Ani Sinha
2024-02-27 15:47 ` [PATCH 16/19] smbios: clear smbios_type4_count before building tables Igor Mammedov
2024-02-27 15:47 ` [PATCH 17/19] tests: acpi/smbios: whitelist expected blobs Igor Mammedov
2024-02-27 15:47 ` [PATCH 18/19] pc/q35: set SMBIOS entry point type to 'auto' by default Igor Mammedov
2024-03-05 12:21 ` Ani Sinha [this message]
2024-02-27 15:47 ` [PATCH 19/19] tests: acpi: update expected SSDT.dimmpxm blob Igor Mammedov
2024-02-27 15:49 ` [PATCH 00/19] Workaround Windows failing to find 64bit SMBIOS entry point with SeaBIOS Michael S. Tsirkin
2024-02-29 13:18 ` Fiona Ebner
2024-03-01 13:55 ` Fiona Ebner
2024-03-05 10:08 ` Michael S. Tsirkin
2024-03-05 10:32 ` Igor Mammedov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=B21B8627-97D5-4047-97BF-963F3CA57DCA@redhat.com \
--to=anisinha@redhat.com \
--cc=alistair.francis@wdc.com \
--cc=armbru@redhat.com \
--cc=bin.meng@windriver.com \
--cc=dbarboza@ventanamicro.com \
--cc=eblake@redhat.com \
--cc=f.ebner@proxmox.com \
--cc=gaosong@loongson.cn \
--cc=imammedo@redhat.com \
--cc=liwei1518@gmail.com \
--cc=mst@redhat.com \
--cc=palmer@dabbelt.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=wangyanan55@huawei.com \
--cc=zhiwei_liu@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).