Sfoglia il codice sorgente

hw/smbios: Remove 'uuid_encoded' argument from smbios_set_defaults()

'uuid_encoded' is always true, remove it.

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-12-philmd@linaro.org>
Philippe Mathieu-Daudé 1 anno fa
parent
commit
c338128e80
6 ha cambiato i file con 7 aggiunte e 11 eliminazioni
  1. 1 2
      hw/arm/virt.c
  2. 1 1
      hw/i386/fw_cfg.c
  3. 1 1
      hw/loongarch/virt.c
  4. 1 1
      hw/riscv/virt.c
  5. 2 4
      hw/smbios/smbios.c
  6. 1 2
      include/hw/firmware/smbios.h

+ 1 - 2
hw/arm/virt.c

@@ -1677,8 +1677,7 @@ static void virt_build_smbios(VirtMachineState *vms)
     }
     }
 
 
     smbios_set_defaults("QEMU", product,
     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 */
     /* build the array of physical mem area from base_memmap */
     mem_array.address = vms->memmap[VIRT_MEM].base;
     mem_array.address = vms->memmap[VIRT_MEM].base;

+ 1 - 1
hw/i386/fw_cfg.c

@@ -63,7 +63,7 @@ void fw_cfg_build_smbios(PCMachineState *pcms, FWCfgState *fw_cfg,
 
 
     if (pcmc->smbios_defaults) {
     if (pcmc->smbios_defaults) {
         /* These values are guest ABI, do not change */
         /* 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 */
     /* tell smbios about cpuid version and features */

+ 1 - 1
hw/loongarch/virt.c

@@ -556,7 +556,7 @@ static void virt_build_smbios(LoongArchVirtMachineState *lvms)
         return;
         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,
     smbios_get_tables(ms, SMBIOS_ENTRY_POINT_TYPE_64,
                       NULL, 0,
                       NULL, 0,

+ 1 - 1
hw/riscv/virt.c

@@ -1277,7 +1277,7 @@ static void virt_build_smbios(RISCVVirtState *s)
         product = "KVM Virtual Machine";
         product = "KVM Virtual Machine";
     }
     }
 
 
-    smbios_set_defaults("QEMU", product, mc->name, true);
+    smbios_set_defaults("QEMU", product, mc->name);
 
 
     if (riscv_is_32bit(&s->soc[0])) {
     if (riscv_is_32bit(&s->soc[0])) {
         smbios_set_default_processor_family(0x200);
         smbios_set_default_processor_family(0x200);

+ 2 - 4
hw/smbios/smbios.c

@@ -30,7 +30,7 @@
 #include "hw/pci/pci_device.h"
 #include "hw/pci/pci_device.h"
 #include "smbios_build.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=<foo>' option
  * SMBIOS tables provided by user with '-smbios file=<foo>' 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,
 void smbios_set_defaults(const char *manufacturer, const char *product,
-                         const char *version,
-                         bool uuid_encoded)
+                         const char *version)
 {
 {
     smbios_have_defaults = true;
     smbios_have_defaults = true;
-    smbios_uuid_encoded = uuid_encoded;
 
 
     SMBIOS_SET_DEFAULT(smbios_type1.manufacturer, manufacturer);
     SMBIOS_SET_DEFAULT(smbios_type1.manufacturer, manufacturer);
     SMBIOS_SET_DEFAULT(smbios_type1.product, product);
     SMBIOS_SET_DEFAULT(smbios_type1.product, product);

+ 1 - 2
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_entry_add(QemuOpts *opts, Error **errp);
 void smbios_set_cpuid(uint32_t version, uint32_t features);
 void smbios_set_cpuid(uint32_t version, uint32_t features);
 void smbios_set_defaults(const char *manufacturer, const char *product,
 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);
 void smbios_set_default_processor_family(uint16_t processor_family);
 uint8_t *smbios_get_table_legacy(size_t *length, Error **errp);
 uint8_t *smbios_get_table_legacy(size_t *length, Error **errp);
 void smbios_get_tables(MachineState *ms,
 void smbios_get_tables(MachineState *ms,