Re: [PATCH v5 10/23] hw/i386/pc: Remove PCMachineClass::smbios_uuid_encoded

[Igor Mammedov]

On Wed, 29 May 2024 07:15:26 +0200
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.
> 
> Reviewed-by: Thomas Huth 
> Signed-off-by: Philippe Mathieu-Daudé 
> Reviewed-by: Zhao Liu 

Reviewed-by: Igor Mammedov 

> ---
>  include/hw/i386/pc.h | 1 -
>  hw/i386/fw_cfg.c | 3 +--
>  hw/i386/pc.c | 1 -
>  3 files changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index db0f8e0e36..bbbf58bd42 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 6e0d9945d0..f9e8af3bf5 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 f27c9fd98c..4b2a29bf08 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1790,7 +1790,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;

[PATCH v5 10/23] hw/i386/pc: Remove PCMachineClass::smbios_uuid_encoded

[Philippe Mathieu-Daudé]

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 
Signed-off-by: Philippe Mathieu-Daudé 
Reviewed-by: Zhao Liu 
---
 include/hw/i386/pc.h | 1 -
 hw/i386/fw_cfg.c | 3 +--
 hw/i386/pc.c | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index db0f8e0e36..bbbf58bd42 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 6e0d9945d0..f9e8af3bf5 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 f27c9fd98c..4b2a29bf08 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1790,7 +1790,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;
-- 
2.41.0