diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2024-03-14 16:22:45 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2024-03-18 08:42:45 -0400 |
| commit | a7bdf7186f8ee5955874438ec2ddb1d28bc084b4 (patch) | |
| tree | 7f9a80e392ad345458699b569d0f2ff09cbb9d43 /hw | |
| parent | 579094cb995b605af07ba3ced3d0a5dc1545509c (diff) | |
| download | qemu-a7bdf7186f8ee5955874438ec2ddb1d28bc084b4.zip qemu-a7bdf7186f8ee5955874438ec2ddb1d28bc084b4.tar.gz qemu-a7bdf7186f8ee5955874438ec2ddb1d28bc084b4.tar.bz2 | |
smbios: cleanup smbios_get_tables() from legacy handling
smbios_get_tables() bails out right away if leagacy mode is enabled
and won't generate any SMBIOS tables. At the same time x86 specific
fw_cfg_build_smbios() will genarate legacy tables and then proceed
to preparing temporary mem_array for useless call to
smbios_get_tables() and then discard it.
Drop legacy related check in smbios_get_tables() and return from
fw_cfg_build_smbios() early if legacy tables where built without
proceeding to non legacy part of the function.
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-5-imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/i386/fw_cfg.c | 1 | ||||
| -rw-r--r-- | hw/smbios/smbios.c | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c index 98a478c..a635234 100644 --- a/hw/i386/fw_cfg.c +++ b/hw/i386/fw_cfg.c @@ -74,6 +74,7 @@ void fw_cfg_build_smbios(PCMachineState *pcms, FWCfgState *fw_cfg) if (smbios_tables) { fw_cfg_add_bytes(fw_cfg, FW_CFG_SMBIOS_ENTRIES, smbios_tables, smbios_tables_len); + return; } /* build the array of physical mem area from e820 table */ diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index 949c2d7..a1741a6 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -1229,12 +1229,6 @@ void smbios_get_tables(MachineState *ms, { unsigned i, dimm_cnt, offset; - if (smbios_legacy) { - *tables = *anchor = NULL; - *tables_len = *anchor_len = 0; - return; - } - if (!smbios_immutable) { smbios_build_type_0_table(); smbios_build_type_1_table(); |