On 2015/8/7 1:15, Wei Huang wrote:
> This patch generates smbios tables for ARM mach-virt. Also add
> CONFIG_SMBIOS=y for ARM default config.
>
> Signed-off-by: Wei Huang <w...@redhat.com>
Reviewed-by: Shannon Zhao <shannon.z...@linaro.org>
> ---
> default-configs/arm-softmmu.mak | 1 +
> hw/arm/virt.c | 27 +++++++++++++++++++++++++++
> include/hw/arm/virt-acpi-build.h | 1 +
> 3 files changed, 29 insertions(+)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 74f1db3..99b41e9 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -102,3 +102,4 @@ CONFIG_XIO3130=y
> CONFIG_IOH3420=y
> CONFIG_I82801B11=y
> CONFIG_ACPI=y
> +CONFIG_SMBIOS=y
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 4846892..d46e815 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -48,6 +48,7 @@
> #include "hw/arm/sysbus-fdt.h"
> #include "hw/platform-bus.h"
> #include "hw/arm/fdt.h"
> +#include "hw/smbios/smbios.h"
>
> /* Number of external interrupt lines to configure the GIC with */
> #define NUM_IRQS 256
> @@ -780,12 +781,37 @@ static void *machvirt_dtb(const struct arm_boot_info
> *binfo, int *fdt_size)
> return board->fdt;
> }
>
> +static void virt_build_smbios(VirtGuestInfo *guest_info)
> +{
> + FWCfgState *fw_cfg = guest_info->fw_cfg;
> + uint8_t *smbios_tables, *smbios_anchor;
> + size_t smbios_tables_len, smbios_anchor_len;
> +
> + if (!fw_cfg)
> + return;
> +
> + smbios_set_defaults("QEMU", "QEMU Virtual Machine",
> + "1.0", false, false, SMBIOS_ENTRY_POINT_30);
> +
> + smbios_get_tables(NULL, 0, guest_info->ram_size,
> + &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
> void virt_guest_info_machine_done(Notifier *notifier, void *data)
> {
> VirtGuestInfoState *guest_info_state = container_of(notifier,
> VirtGuestInfoState,
> machine_done);
> virt_acpi_setup(&guest_info_state->info);
> + virt_build_smbios(&guest_info_state->info);
> }
>
> static void machvirt_init(MachineState *machine)
> @@ -894,6 +920,7 @@ static void machvirt_init(MachineState *machine)
>
> guest_info->smp_cpus = smp_cpus;
> guest_info->fw_cfg = fw_cfg_find();
> + guest_info->ram_size = machine->ram_size;
> guest_info->memmap = vbi->memmap;
> guest_info->irqmap = vbi->irqmap;
> guest_info_state->machine_done.notify = virt_guest_info_machine_done;
> diff --git a/include/hw/arm/virt-acpi-build.h
> b/include/hw/arm/virt-acpi-build.h
> index 04f174d..ef274c6 100644
> --- a/include/hw/arm/virt-acpi-build.h
> +++ b/include/hw/arm/virt-acpi-build.h
> @@ -29,6 +29,7 @@
> typedef struct VirtGuestInfo {
> int smp_cpus;
> FWCfgState *fw_cfg;
> + ram_addr_t ram_size;
> const MemMapEntry *memmap;
> const int *irqmap;
> } VirtGuestInfo;
>
--
Shannon
