[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 18/19] pc/q35: set SMBIOS entry point type to 'auto' by default
From: |
Igor Mammedov |
Subject: |
[PATCH 18/19] pc/q35: set SMBIOS entry point type to 'auto' by default |
Date: |
Tue, 27 Feb 2024 16:47:48 +0100 |
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>
---
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
- [PATCH 09/19] smbios: build legacy mode code only for 'pc' machine, (continued)
- [PATCH 09/19] smbios: build legacy mode code only for 'pc' machine, Igor Mammedov, 2024/02/27
- [PATCH 11/19] smbios: clear smbios_tables pointer after freeing, Igor Mammedov, 2024/02/27
- [PATCH 08/19] smbios: don't check type4 structures in legacy mode, Igor Mammedov, 2024/02/27
- [PATCH 12/19] get rid of global smbios_ep_type, Igor Mammedov, 2024/02/27
- [PATCH 13/19] smbios: extend smbios-entry-point-type with 'auto' value, Igor Mammedov, 2024/02/27
- [PATCH 15/19] smbios: error out when building type 4 table is not possible, Igor Mammedov, 2024/02/27
- [PATCH 07/19] smbios: avoid mangling user provided tables, Igor Mammedov, 2024/02/27
- [PATCH 14/19] smbios: in case of entry point is 'auto' try to build v2 tables 1st, Igor Mammedov, 2024/02/27
- [PATCH 16/19] smbios: clear smbios_type4_count before building tables, Igor Mammedov, 2024/02/27
- [PATCH 18/19] pc/q35: set SMBIOS entry point type to 'auto' by default,
Igor Mammedov <=
- [PATCH 17/19] tests: acpi/smbios: whitelist expected blobs, Igor Mammedov, 2024/02/27
- [PATCH 19/19] tests: acpi: update expected SSDT.dimmpxm blob, Igor Mammedov, 2024/02/27
- Re: [PATCH 00/19] Workaround Windows failing to find 64bit SMBIOS entry point with SeaBIOS, Michael S. Tsirkin, 2024/02/27
- Re: [PATCH 00/19] Workaround Windows failing to find 64bit SMBIOS entry point with SeaBIOS, Fiona Ebner, 2024/02/29