aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <philmd@linaro.org>2024-02-28 09:44:02 +0100
committerPhilippe Mathieu-Daudé <philmd@linaro.org>2024-06-19 12:40:49 +0200
commit05814d9663a0bf995286c822696b406330f8f602 (patch)
tree5817a2090f672fede76fb729358562395cb31b90
parent63f16d97c6a15532bf4fe17ac9874b94baf58ac2 (diff)
downloadqemu-05814d9663a0bf995286c822696b406330f8f602.zip
qemu-05814d9663a0bf995286c822696b406330f8f602.tar.gz
qemu-05814d9663a0bf995286c822696b406330f8f602.tar.bz2
hw/i386/pc: Remove PCMachineClass::smbios_uuid_encoded
PCMachineClass::smbios_uuid_encoded was only used by the pc-i440fx-2.1 machine, which got removed. It is now always true, remove it. Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Zhao Liu <zhao1.liu@intel.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Message-Id: <20240617071118.60464-11-philmd@linaro.org>
-rw-r--r--hw/i386/fw_cfg.c3
-rw-r--r--hw/i386/pc.c1
-rw-r--r--include/hw/i386/pc.h1
3 files changed, 1 insertions, 4 deletions
diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c
index 6e0d994..f9e8af3 100644
--- a/hw/i386/fw_cfg.c
+++ b/hw/i386/fw_cfg.c
@@ -63,8 +63,7 @@ void fw_cfg_build_smbios(PCMachineState *pcms, FWCfgState *fw_cfg,
if (pcmc->smbios_defaults) {
/* These values are guest ABI, do not change */
- smbios_set_defaults("QEMU", mc->desc, mc->name,
- pcmc->smbios_uuid_encoded);
+ smbios_set_defaults("QEMU", mc->desc, mc->name, true);
}
/* tell smbios about cpuid version and features */
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index b0b8ecd..215462e 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1796,7 +1796,6 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
pcmc->has_acpi_build = true;
pcmc->rsdp_in_ram = true;
pcmc->smbios_defaults = true;
- pcmc->smbios_uuid_encoded = true;
pcmc->gigabyte_align = true;
pcmc->has_reserved_memory = true;
pcmc->enforce_aligned_dimm = true;
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 0d73031..5667b87 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -109,7 +109,6 @@ struct PCMachineClass {
/* SMBIOS compat: */
bool smbios_defaults;
bool smbios_legacy_mode;
- bool smbios_uuid_encoded;
SmbiosEntryPointType default_smbios_ep_type;
/* RAM / address space compat: */