[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 21/24] smbios: extract x86 smbios building code into
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 21/24] smbios: extract x86 smbios building code into a function |
Date: |
Thu, 13 Aug 2015 15:15:42 +0300 |
From: Wei Huang <address@hidden>
This patch extracts out the procedure of buidling x86 SMBIOS tables
into a dedicated function.
Acked-by: Gabriel Somlo <address@hidden>
Tested-by: Gabriel Somlo <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Tested-by: Leif Lindholm <address@hidden>
Signed-off-by: Wei Huang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/i386/pc.c | 38 ++++++++++++++++++++++----------------
1 file changed, 22 insertions(+), 16 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 0c828e4..d75a8b4 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -716,11 +716,30 @@ static unsigned int pc_apic_id_limit(unsigned int
max_cpus)
return x86_cpu_apic_id_from_index(max_cpus - 1) + 1;
}
-static FWCfgState *bochs_bios_init(void)
+static void pc_build_smbios(FWCfgState *fw_cfg)
{
- FWCfgState *fw_cfg;
uint8_t *smbios_tables, *smbios_anchor;
size_t smbios_tables_len, smbios_anchor_len;
+
+ smbios_tables = smbios_get_table_legacy(&smbios_tables_len);
+ if (smbios_tables) {
+ fw_cfg_add_bytes(fw_cfg, FW_CFG_SMBIOS_ENTRIES,
+ smbios_tables, smbios_tables_len);
+ }
+
+ smbios_get_tables(&smbios_tables, &smbios_tables_len,
+ &smbios_anchor, &smbios_anchor_len);
+ if (smbios_anchor) {
+ fw_cfg_add_file(fw_cfg, "etc/smbios/smbios-tables",
+ smbios_tables, smbios_tables_len);
+ fw_cfg_add_file(fw_cfg, "etc/smbios/smbios-anchor",
+ smbios_anchor, smbios_anchor_len);
+ }
+}
+
+static FWCfgState *bochs_bios_init(void)
+{
+ FWCfgState *fw_cfg;
uint64_t *numa_fw_cfg;
int i, j;
unsigned int apic_id_limit = pc_apic_id_limit(max_cpus);
@@ -746,20 +765,7 @@ static FWCfgState *bochs_bios_init(void)
acpi_tables, acpi_tables_len);
fw_cfg_add_i32(fw_cfg, FW_CFG_IRQ0_OVERRIDE, kvm_allows_irq0_override());
- smbios_tables = smbios_get_table_legacy(&smbios_tables_len);
- if (smbios_tables) {
- fw_cfg_add_bytes(fw_cfg, FW_CFG_SMBIOS_ENTRIES,
- smbios_tables, smbios_tables_len);
- }
-
- smbios_get_tables(&smbios_tables, &smbios_tables_len,
- &smbios_anchor, &smbios_anchor_len);
- if (smbios_anchor) {
- fw_cfg_add_file(fw_cfg, "etc/smbios/smbios-tables",
- smbios_tables, smbios_tables_len);
- fw_cfg_add_file(fw_cfg, "etc/smbios/smbios-anchor",
- smbios_anchor, smbios_anchor_len);
- }
+ pc_build_smbios(fw_cfg);
fw_cfg_add_bytes(fw_cfg, FW_CFG_E820_TABLE,
&e820_reserve, sizeof(e820_reserve));
--
MST
- [Qemu-devel] [PULL 12/24] pc: Use PCMachineState for pc_memory_init() argument, (continued)
- [Qemu-devel] [PULL 12/24] pc: Use PCMachineState for pc_memory_init() argument, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 11/24] pc: Use PCMachineState for pc_cmos_init() argument, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 14/24] pc: Use PCMachineState as pc_guest_info_init() argument, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 13/24] pc: Move {above, below}_4g_mem_size variables to PCMachineState, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 15/24] pc: Remove redundant arguments from *load_linux(), Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 17/24] pc: Remove redundant arguments from pc_memory_init(), Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 16/24] pc: Remove redundant arguments from pc_cmos_init(), Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 18/24] pci: allow 0 address for PCI IO/MEM regions, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 19/24] virtio-net: remove useless codes, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 20/24] acpi: avoid potential uninitialized access to cpu_hp_io_base, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 21/24] smbios: extract x86 smbios building code into a function,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 22/24] smbios: remove dependency on x86 e820 tables, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 23/24] smbios: move smbios code into a common folder, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 24/24] MAINTAINERS: list smbios maintainers, Michael S. Tsirkin, 2015/08/13
- Re: [Qemu-devel] [PULL 00/24] virtio,pc,acpi fixes, cleanups, Peter Maydell, 2015/08/13