[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [ARM SMBIOS RFC PATCH 1/5] smbios: extract x86 smbios build
From: |
Wei Huang |
Subject: |
[Qemu-devel] [ARM SMBIOS RFC PATCH 1/5] smbios: extract x86 smbios building code into a function |
Date: |
Tue, 14 Jul 2015 16:23:07 -0400 |
This patch extracts out the procedure of buidling x86 SMBIOS tables
into a dedicated function.
Signed-off-by: Wei Huang <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 7661ea9..00e45f3 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -718,11 +718,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);
@@ -748,20 +767,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));
--
1.8.3.1
- [Qemu-devel] [ARM SMBIOS RFC PATCH 0/5] SMBIOS Support for ARM, Wei Huang, 2015/07/14
- [Qemu-devel] [ARM SMBIOS RFC PATCH 3/5] smbios: pass ram size as a parameter to build smbios tables, Wei Huang, 2015/07/14
- [Qemu-devel] [ARM SMBIOS RFC PATCH 2/5] smbios: remove dependency on x86 e820 tables, Wei Huang, 2015/07/14
- [Qemu-devel] [ARM SMBIOS RFC PATCH 1/5] smbios: extract x86 smbios building code into a function,
Wei Huang <=
- [Qemu-devel] [ARM SMBIOS RFC PATCH 5/5] smbios: implement smbios support for mach-virt, Wei Huang, 2015/07/14
- [Qemu-devel] [ARM SMBIOS RFC PATCH 4/5] smbios: move smbios code into a common folder, Wei Huang, 2015/07/14
- Re: [Qemu-devel] [ARM SMBIOS RFC PATCH 0/5] SMBIOS Support for ARM, Laszlo Ersek, 2015/07/14
- Re: [Qemu-devel] [ARM SMBIOS RFC PATCH 0/5] SMBIOS Support for ARM, Laszlo Ersek, 2015/07/15
- Re: [Qemu-devel] [ARM SMBIOS RFC PATCH 0/5] SMBIOS Support for ARM, Gabriel L. Somlo, 2015/07/16