Commit c30e1565 authored by Wei Huang's avatar Wei Huang Committed by Peter Maydell
Browse files

smbios: implement smbios support for mach-virt 



This patch generates smbios tables for ARM mach-virt. Also add
CONFIG_SMBIOS=y for ARM default config.

Acked-by: default avatarGabriel Somlo <somlo@cmu.edu>
Tested-by: default avatarGabriel Somlo <somlo@cmu.edu>
Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
Reviewed-by: default avatarShannon Zhao <shannon.zhao@linaro.org>
Tested-by: default avatarLeif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: default avatarWei Huang <wei@redhat.com>
Message-id: 1440615870-9518-3-git-send-email-wei@redhat.com
[PMM: Added missing braces around an if().]
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 86299120

default-configs/arm-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -102,3 +102,4 @@ CONFIG_XIO3130=y 
CONFIG_IOH3420=y

CONFIG_I82801B11=y

CONFIG_ACPI=y

CONFIG_SMBIOS=y

hw/arm/virt.c

+26 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include "hw/arm/fdt.h"

#include "hw/intc/arm_gic_common.h"

#include "kvm_arm.h"

#include "hw/smbios/smbios.h"



/* Number of external interrupt lines to configure the GIC with */

#define NUM_IRQS 256
@@ -788,12 +789,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, true, SMBIOS_ENTRY_POINT_30);



    smbios_get_tables(NULL, 0, &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)

qemu-options.hx

+1 −1
Original line number Diff line number Diff line
@@ -1412,7 +1412,7 @@ DEF("smbios", HAS_ARG, QEMU_OPTION_smbios, 
    "-smbios type=17[,loc_pfx=str][,bank=str][,manufacturer=str][,serial=str]\n"

    "               [,asset=str][,part=str][,speed=%d]\n"

    "                specify SMBIOS type 17 fields\n",

    QEMU_ARCH_I386)

    QEMU_ARCH_I386 | QEMU_ARCH_ARM)

STEXI

@item -smbios file=@var{binary}

@findex -smbios