diff mbox series

[PATCH-for-9.1,08/18] hw/i386/pc: Remove PCMachineClass::smbios_uuid_encoded

Message ID 20240305134221.30924-9-philmd@linaro.org
State New
Headers show
Series [PATCH-for-9.1,01/18] hw/i386/pc: Remove deprecated pc-i440fx-2.0 machine | expand

Commit Message

Philippe Mathieu-Daudé March 5, 2024, 1:42 p.m. UTC 
PCMachineClass::smbios_uuid_encoded was only used by the
pc-i440fx-2.1 machine, which got removed. It is now always
true, remove it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/hw/i386/pc.h | 1 -
 hw/i386/fw_cfg.c     | 2 +-
 hw/i386/pc.c         | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

Comments

Thomas Huth March 6, 2024, 4:54 p.m. UTC | #1 
On 05/03/2024 14.42, Philippe Mathieu-Daudé wrote:
> PCMachineClass::smbios_uuid_encoded was only used by the
> pc-i440fx-2.1 machine, which got removed. It is now always
> true, remove it.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   include/hw/i386/pc.h | 1 -
>   hw/i386/fw_cfg.c     | 2 +-
>   hw/i386/pc.c         | 1 -
>   3 files changed, 1 insertion(+), 3 deletions(-)

Reviewed-by: Thomas Huth <thuth@redhat.com>
diff mbox series

Patch

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index f77639d94f..f051ddafca 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: */
diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c
index 98a478c276..176c086673 100644
--- a/hw/i386/fw_cfg.c
+++ b/hw/i386/fw_cfg.c
@@ -63,7 +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_legacy_mode, pcmc->smbios_uuid_encoded,
+                            pcmc->smbios_legacy_mode, true,
                             pcms->smbios_entry_point_type);
     }
 
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index d417cf106c..409114bba5 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1791,7 +1791,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;