Re: [PATCH v5 11/23] hw/smbios: Remove 'uuid_encoded' argument from smbios_set_defaults()
On Wed, 29 May 2024 07:15:27 +0200
Philippe Mathieu-Daudé wrote:
> 'uuid_encoded' is always true, remove it.
>
> Signed-off-by: Philippe Mathieu-Daudé
> Reviewed-by: Zhao Liu
Reviewed-by: Igor Mammedov
> ---
> include/hw/firmware/smbios.h | 3 +--
> hw/arm/virt.c| 3 +--
> hw/i386/fw_cfg.c | 2 +-
> hw/loongarch/virt.c | 2 +-
> hw/riscv/virt.c | 2 +-
> hw/smbios/smbios.c | 6 ++
> 6 files changed, 7 insertions(+), 11 deletions(-)
>
> diff --git a/include/hw/firmware/smbios.h b/include/hw/firmware/smbios.h
> index 8d3fb2fb3b..f066ab7262 100644
> --- a/include/hw/firmware/smbios.h
> +++ b/include/hw/firmware/smbios.h
> @@ -331,8 +331,7 @@ void smbios_add_usr_blob_size(size_t size);
> void smbios_entry_add(QemuOpts *opts, Error **errp);
> void smbios_set_cpuid(uint32_t version, uint32_t features);
> void smbios_set_defaults(const char *manufacturer, const char *product,
> - const char *version,
> - bool uuid_encoded);
> + const char *version);
> void smbios_set_default_processor_family(uint16_t processor_family);
> uint8_t *smbios_get_table_legacy(size_t *length, Error **errp);
> void smbios_get_tables(MachineState *ms,
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 3c93c0c0a6..268b25e332 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -1677,8 +1677,7 @@ static void virt_build_smbios(VirtMachineState *vms)
> }
>
> smbios_set_defaults("QEMU", product,
> -vmc->smbios_old_sys_ver ? "1.0" : mc->name,
> -true);
> +vmc->smbios_old_sys_ver ? "1.0" : mc->name);
>
> /* build the array of physical mem area from base_memmap */
> mem_array.address = vms->memmap[VIRT_MEM].base;
> diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c
> index f9e8af3bf5..7c43c325ef 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, true);
> +smbios_set_defaults("QEMU", mc->desc, mc->name);
> }
>
> /* tell smbios about cpuid version and features */
> diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
> index 3e6e93edf3..6a12659583 100644
> --- a/hw/loongarch/virt.c
> +++ b/hw/loongarch/virt.c
> @@ -529,7 +529,7 @@ static void virt_build_smbios(LoongArchVirtMachineState
> *lvms)
> return;
> }
>
> -smbios_set_defaults("QEMU", product, mc->name, true);
> +smbios_set_defaults("QEMU", product, mc->name);
>
> smbios_get_tables(ms, SMBIOS_ENTRY_POINT_TYPE_64,
>NULL, 0,
> diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
> index 4fdb660525..5676d66d12 100644
> --- a/hw/riscv/virt.c
> +++ b/hw/riscv/virt.c
> @@ -1277,7 +1277,7 @@ static void virt_build_smbios(RISCVVirtState *s)
> product = "KVM Virtual Machine";
> }
>
> -smbios_set_defaults("QEMU", product, mc->name, true);
> +smbios_set_defaults("QEMU", product, mc->name);
>
> if (riscv_is_32bit(>soc[0])) {
> smbios_set_default_processor_family(0x200);
> diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
> index eed5787b15..8261eb716f 100644
> --- a/hw/smbios/smbios.c
> +++ b/hw/smbios/smbios.c
> @@ -30,7 +30,7 @@
> #include "hw/pci/pci_device.h"
> #include "smbios_build.h"
>
> -static bool smbios_uuid_encoded = true;
> +static const bool smbios_uuid_encoded = true;
> /*
> * SMBIOS tables provided by user with '-smbios file=' option
> */
> @@ -1017,11 +1017,9 @@ void smbios_set_default_processor_family(uint16_t
> processor_family)
> }
>
> void smbios_set_defaults(const char *manufacturer, const char *product,
> - const char *version,
> - bool uuid_encoded)
> + const char *version)
> {
> smbios_have_defaults = true;
> -smbios_uuid_encoded = uuid_encoded;
>
> SMBIOS_SET_DEFAULT(smbios_type1.manufacturer, manufacturer);
> SMBIOS_SET_DEFAULT(smbios_type1.product, product);
[PATCH v5 11/23] hw/smbios: Remove 'uuid_encoded' argument from smbios_set_defaults()
'uuid_encoded' is always true, remove it.
Signed-off-by: Philippe Mathieu-Daudé
Reviewed-by: Zhao Liu
---
include/hw/firmware/smbios.h | 3 +--
hw/arm/virt.c| 3 +--
hw/i386/fw_cfg.c | 2 +-
hw/loongarch/virt.c | 2 +-
hw/riscv/virt.c | 2 +-
hw/smbios/smbios.c | 6 ++
6 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/include/hw/firmware/smbios.h b/include/hw/firmware/smbios.h
index 8d3fb2fb3b..f066ab7262 100644
--- a/include/hw/firmware/smbios.h
+++ b/include/hw/firmware/smbios.h
@@ -331,8 +331,7 @@ void smbios_add_usr_blob_size(size_t size);
void smbios_entry_add(QemuOpts *opts, Error **errp);
void smbios_set_cpuid(uint32_t version, uint32_t features);
void smbios_set_defaults(const char *manufacturer, const char *product,
- const char *version,
- bool uuid_encoded);
+ const char *version);
void smbios_set_default_processor_family(uint16_t processor_family);
uint8_t *smbios_get_table_legacy(size_t *length, Error **errp);
void smbios_get_tables(MachineState *ms,
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 3c93c0c0a6..268b25e332 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1677,8 +1677,7 @@ static void virt_build_smbios(VirtMachineState *vms)
}
smbios_set_defaults("QEMU", product,
-vmc->smbios_old_sys_ver ? "1.0" : mc->name,
-true);
+vmc->smbios_old_sys_ver ? "1.0" : mc->name);
/* build the array of physical mem area from base_memmap */
mem_array.address = vms->memmap[VIRT_MEM].base;
diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c
index f9e8af3bf5..7c43c325ef 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, true);
+smbios_set_defaults("QEMU", mc->desc, mc->name);
}
/* tell smbios about cpuid version and features */
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index 3e6e93edf3..6a12659583 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -529,7 +529,7 @@ static void virt_build_smbios(LoongArchVirtMachineState
*lvms)
return;
}
-smbios_set_defaults("QEMU", product, mc->name, true);
+smbios_set_defaults("QEMU", product, mc->name);
smbios_get_tables(ms, SMBIOS_ENTRY_POINT_TYPE_64,
NULL, 0,
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index 4fdb660525..5676d66d12 100644
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -1277,7 +1277,7 @@ static void virt_build_smbios(RISCVVirtState *s)
product = "KVM Virtual Machine";
}
-smbios_set_defaults("QEMU", product, mc->name, true);
+smbios_set_defaults("QEMU", product, mc->name);
if (riscv_is_32bit(>soc[0])) {
smbios_set_default_processor_family(0x200);
diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index eed5787b15..8261eb716f 100644
--- a/hw/smbios/smbios.c
+++ b/hw/smbios/smbios.c
@@ -30,7 +30,7 @@
#include "hw/pci/pci_device.h"
#include "smbios_build.h"
-static bool smbios_uuid_encoded = true;
+static const bool smbios_uuid_encoded = true;
/*
* SMBIOS tables provided by user with '-smbios file=' option
*/
@@ -1017,11 +1017,9 @@ void smbios_set_default_processor_family(uint16_t
processor_family)
}
void smbios_set_defaults(const char *manufacturer, const char *product,
- const char *version,
- bool uuid_encoded)
+ const char *version)
{
smbios_have_defaults = true;
-smbios_uuid_encoded = uuid_encoded;
SMBIOS_SET_DEFAULT(smbios_type1.manufacturer, manufacturer);
SMBIOS_SET_DEFAULT(smbios_type1.product, product);
--
2.41.0
