mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/i386/pc: Default to use SMBIOS 3.0 for newer machine models

Browse Source 
Currently, pc-q35 and pc-i44fx machine models are default to use SMBIOS 2.8
(32-bit entry point). Since SMBIOS 3.0 (64-bit entry point) is now fully
supported since QEMU 7.0, default to use SMBIOS 3.0 for newer machine
models. This is necessary to avoid the following message when launching
a VM with large number of vcpus.

   "SMBIOS 2.1 table length 66822 exceeds 65535"

Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Message-Id: <20230607205717.737749-2-suravee.suthikulpanit@amd.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
This commit is contained in:
Suravee Suthikulpanit 2023-06-07 15:57:16 -05:00 committed by Michael S. Tsirkin
parent 42b1b9d7db
commit bf376f3020
5 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/i386/pc.c
View File

@ -1856,6 +1856,7 @@ static void pc_machine_set_max_fw_size(Object *obj, Visitor *v,
static void pc_machine_initfn(Object *obj) static void pc_machine_initfn(Object *obj)
{ {
PCMachineState *pcms = PC_MACHINE(obj); PCMachineState *pcms = PC_MACHINE(obj);
PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
#ifdef CONFIG_VMPORT #ifdef CONFIG_VMPORT
pcms->vmport = ON_OFF_AUTO_AUTO; pcms->vmport = ON_OFF_AUTO_AUTO;
@ -1863,7 +1864,7 @@ static void pc_machine_initfn(Object *obj)
pcms->vmport = ON_OFF_AUTO_OFF; pcms->vmport = ON_OFF_AUTO_OFF;
#endif /* CONFIG_VMPORT */ #endif /* CONFIG_VMPORT */
pcms->max_ram_below_4g = 0; /* use default */ pcms->max_ram_below_4g = 0; /* use default */
pcms->smbios_entry_point_type = SMBIOS_ENTRY_POINT_TYPE_32; pcms->smbios_entry_point_type = pcmc->default_smbios_ep_type;
/* acpi build is enabled by default if machine supports it */ /* acpi build is enabled by default if machine supports it */
pcms->acpi_build_enabled = PC_MACHINE_GET_CLASS(pcms)->has_acpi_build; pcms->acpi_build_enabled = PC_MACHINE_GET_CLASS(pcms)->has_acpi_build;
@ -1975,6 +1976,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
mc->nvdimm_supported = true; mc->nvdimm_supported = true;
mc->smp_props.dies_supported = true; mc->smp_props.dies_supported = true;
mc->default_ram_id = "pc.ram"; mc->default_ram_id = "pc.ram";
pcmc->default_smbios_ep_type = SMBIOS_ENTRY_POINT_TYPE_64;
object_class_property_add(oc, PC_MACHINE_MAX_RAM_BELOW_4G, "size", 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, pc_machine_get_max_ram_below_4g, pc_machine_set_max_ram_below_4g,

5
hw/i386/pc_piix.c
View File

@ -506,11 +506,16 @@ DEFINE_I440FX_MACHINE(v8_1, "pc-i440fx-8.1", NULL,
static void pc_i440fx_8_0_machine_options(MachineClass *m) static void pc_i440fx_8_0_machine_options(MachineClass *m)
{ {
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_i440fx_8_1_machine_options(m); pc_i440fx_8_1_machine_options(m);
m->alias = NULL; m->alias = NULL;
m->is_default = false; m->is_default = false;
compat_props_add(m->compat_props, hw_compat_8_0, hw_compat_8_0_len); compat_props_add(m->compat_props, hw_compat_8_0, hw_compat_8_0_len);
compat_props_add(m->compat_props, pc_compat_8_0, pc_compat_8_0_len); compat_props_add(m->compat_props, pc_compat_8_0, pc_compat_8_0_len);
/* For pc-i44fx-8.0 and older, use SMBIOS 2.8 by default */
pcmc->default_smbios_ep_type = SMBIOS_ENTRY_POINT_TYPE_32;
} }
DEFINE_I440FX_MACHINE(v8_0, "pc-i440fx-8.0", NULL, DEFINE_I440FX_MACHINE(v8_0, "pc-i440fx-8.0", NULL,

5
hw/i386/pc_q35.c
View File

@ -387,10 +387,15 @@ DEFINE_Q35_MACHINE(v8_1, "pc-q35-8.1", NULL,
static void pc_q35_8_0_machine_options(MachineClass *m) static void pc_q35_8_0_machine_options(MachineClass *m)
{ {
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_q35_8_1_machine_options(m); pc_q35_8_1_machine_options(m);
m->alias = NULL; m->alias = NULL;
compat_props_add(m->compat_props, hw_compat_8_0, hw_compat_8_0_len); compat_props_add(m->compat_props, hw_compat_8_0, hw_compat_8_0_len);
compat_props_add(m->compat_props, pc_compat_8_0, pc_compat_8_0_len); compat_props_add(m->compat_props, pc_compat_8_0, pc_compat_8_0_len);
/* For pc-q35-8.0 and older, use SMBIOS 2.8 by default */
pcmc->default_smbios_ep_type = SMBIOS_ENTRY_POINT_TYPE_32;
} }
DEFINE_Q35_MACHINE(v8_0, "pc-q35-8.0", NULL, DEFINE_Q35_MACHINE(v8_0, "pc-q35-8.0", NULL,

1
include/hw/i386/pc.h
View File

@ -110,6 +110,7 @@ struct PCMachineClass {
bool smbios_defaults; bool smbios_defaults;
bool smbios_legacy_mode; bool smbios_legacy_mode;
bool smbios_uuid_encoded; bool smbios_uuid_encoded;
SmbiosEntryPointType default_smbios_ep_type;
/* RAM / address space compat: */ /* RAM / address space compat: */
bool gigabyte_align; bool gigabyte_align;

1
tests/qtest/bios-tables-test-allowed-diff.h
View File

@ -1 +1,2 @@
/* List of comma-separated changed AML files to ignore */ /* List of comma-separated changed AML files to ignore */
"tests/data/acpi/q35/SSDT.dimmpxm",