ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

smbios: get rid of smbios_smp_sockets global 

it makes smbios_validate_table() independent from
smbios_smp_sockets global, which in turn lets
smbios_get_tables() avoid using not related legacy code.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Ani Sinha <anisinha@redhat.com>
Tested-by: Fiona Ebner <f.ebner@proxmox.com>
Message-Id: <20240314152302.2324164-6-imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Igor Mammedov 2024-03-14 16:22:46 +01:00 committed by Michael S. Tsirkin
parent a7bdf7186f
commit e94e0a833b
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/i386/fw_cfg.c
View File

@ -70,7 +70,7 @@ void fw_cfg_build_smbios(PCMachineState *pcms, FWCfgState *fw_cfg)
/* tell smbios about cpuid version and features */ /* tell smbios about cpuid version and features */
smbios_set_cpuid(cpu->env.cpuid_version, cpu->env.features[FEAT_1_EDX]); smbios_set_cpuid(cpu->env.cpuid_version, cpu->env.features[FEAT_1_EDX]);
smbios_tables = smbios_get_table_legacy(ms, &smbios_tables_len); smbios_tables = smbios_get_table_legacy(ms->smp.cpus, &smbios_tables_len);
if (smbios_tables) { if (smbios_tables) {
fw_cfg_add_bytes(fw_cfg, FW_CFG_SMBIOS_ENTRIES, fw_cfg_add_bytes(fw_cfg, FW_CFG_SMBIOS_ENTRIES,
smbios_tables, smbios_tables_len); smbios_tables, smbios_tables_len);

22
hw/smbios/smbios.c
View File

@ -70,7 +70,7 @@ static SmbiosEntryPoint ep;
static int smbios_type4_count = 0; static int smbios_type4_count = 0;
static bool smbios_immutable; static bool smbios_immutable;
static bool smbios_have_defaults; static bool smbios_have_defaults;
static uint32_t smbios_cpuid_version, smbios_cpuid_features, smbios_smp_sockets; static uint32_t smbios_cpuid_version, smbios_cpuid_features;
static DECLARE_BITMAP(have_binfile_bitmap, SMBIOS_MAX_TYPE+1); static DECLARE_BITMAP(have_binfile_bitmap, SMBIOS_MAX_TYPE+1);
static DECLARE_BITMAP(have_fields_bitmap, SMBIOS_MAX_TYPE+1); static DECLARE_BITMAP(have_fields_bitmap, SMBIOS_MAX_TYPE+1);
@ -539,14 +539,11 @@ opts_init(smbios_register_config);
*/ */
#define SMBIOS_21_MAX_TABLES_LEN 0xffff #define SMBIOS_21_MAX_TABLES_LEN 0xffff
static void smbios_validate_table(MachineState *ms) static void smbios_validate_table(uint32_t expected_t4_count)
{ {
uint32_t expect_t4_count = smbios_legacy ? if (smbios_type4_count && smbios_type4_count != expected_t4_count) {
ms->smp.cpus : smbios_smp_sockets;
if (smbios_type4_count && smbios_type4_count != expect_t4_count) {
error_report("Expected %d SMBIOS Type 4 tables, got %d instead", error_report("Expected %d SMBIOS Type 4 tables, got %d instead",
expect_t4_count, smbios_type4_count); expected_t4_count, smbios_type4_count);
exit(1); exit(1);
} }
@ -634,7 +631,7 @@ static void smbios_build_type_1_fields(void)
} }
} }
uint8_t *smbios_get_table_legacy(MachineState *ms, size_t *length) uint8_t *smbios_get_table_legacy(uint32_t expected_t4_count, size_t *length)
{ {
if (!smbios_legacy) { if (!smbios_legacy) {
*length = 0; *length = 0;
@ -644,7 +641,7 @@ uint8_t *smbios_get_table_legacy(MachineState *ms, size_t *length)
if (!smbios_immutable) { if (!smbios_immutable) {
smbios_build_type_0_fields(); smbios_build_type_0_fields();
smbios_build_type_1_fields(); smbios_build_type_1_fields();
smbios_validate_table(ms); smbios_validate_table(expected_t4_count);
smbios_immutable = true; smbios_immutable = true;
} }
*length = smbios_entries_len; *length = smbios_entries_len;
@ -1235,10 +1232,9 @@ void smbios_get_tables(MachineState *ms,
smbios_build_type_2_table(); smbios_build_type_2_table();
smbios_build_type_3_table(); smbios_build_type_3_table();
smbios_smp_sockets = ms->smp.sockets; assert(ms->smp.sockets >= 1);
assert(smbios_smp_sockets >= 1);
for (i = 0; i < smbios_smp_sockets; i++) { for (i = 0; i < ms->smp.sockets; i++) {
smbios_build_type_4_table(ms, i); smbios_build_type_4_table(ms, i);
} }
@ -1284,7 +1280,7 @@ void smbios_get_tables(MachineState *ms,
smbios_build_type_41_table(errp); smbios_build_type_41_table(errp);
smbios_build_type_127_table(); smbios_build_type_127_table();
smbios_validate_table(ms); smbios_validate_table(ms->smp.sockets);
smbios_entry_point_setup(); smbios_entry_point_setup();
smbios_immutable = true; smbios_immutable = true;
} }

2
include/hw/firmware/smbios.h
View File

@ -313,7 +313,7 @@ void smbios_set_defaults(const char *manufacturer, const char *product,
const char *version, bool legacy_mode, const char *version, bool legacy_mode,
bool uuid_encoded, SmbiosEntryPointType ep_type); bool uuid_encoded, SmbiosEntryPointType ep_type);
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(MachineState *ms, size_t *length); uint8_t *smbios_get_table_legacy(uint32_t expected_t4_count, size_t *length);
void smbios_get_tables(MachineState *ms, void smbios_get_tables(MachineState *ms,
const struct smbios_phys_mem_area *mem_array, const struct smbios_phys_mem_area *mem_array,
const unsigned int mem_array_size, const unsigned int mem_array_size,