From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38376) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNmHj-0000DP-IX for qemu-devel@nongnu.org; Fri, 07 Aug 2015 14:22:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZNmHg-0007G2-BM for qemu-devel@nongnu.org; Fri, 07 Aug 2015 14:22:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48995) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNmHg-0007Fj-3b for qemu-devel@nongnu.org; Fri, 07 Aug 2015 14:22:24 -0400 References: <1438881300-21738-1-git-send-email-wei@redhat.com> <1438881300-21738-7-git-send-email-wei@redhat.com> From: Laszlo Ersek Message-ID: <55C4F756.7080003@redhat.com> Date: Fri, 7 Aug 2015 20:22:14 +0200 MIME-Version: 1.0 In-Reply-To: <1438881300-21738-7-git-send-email-wei@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [ARM SMBIOS V2 PATCH 6/6] smbios: implement smbios support for mach-virt List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Wei Huang , qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, drjones@redhat.com, ard.biesheuvel@linaro.org, ehabkost@redhat.com, ivan.khoronzhuk@linaro.org, mst@redhat.com, somlo@cmu.edu, zhaoshenglong@huawei.com, roy.franz@linaro.org, pbonzini@redhat.com, imammedo@redhat.com, jdelvare@suse.de, rth@twiddle.net comments below On 08/06/15 19:15, Wei Huang wrote: > This patch generates smbios tables for ARM mach-virt. Also add > CONFIG_SMBIOS=3Dy for ARM default config. >=20 > Signed-off-by: Wei Huang > --- > default-configs/arm-softmmu.mak | 1 + > hw/arm/virt.c | 27 +++++++++++++++++++++++++++ > include/hw/arm/virt-acpi-build.h | 1 + > 3 files changed, 29 insertions(+) >=20 > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-soft= mmu.mak > index 74f1db3..99b41e9 100644 > --- a/default-configs/arm-softmmu.mak > +++ b/default-configs/arm-softmmu.mak > @@ -102,3 +102,4 @@ CONFIG_XIO3130=3Dy > CONFIG_IOH3420=3Dy > CONFIG_I82801B11=3Dy > CONFIG_ACPI=3Dy > +CONFIG_SMBIOS=3Dy > 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" > =20 > /* 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_i= nfo *binfo, int *fdt_size) > return board->fdt; > } > =20 > +static void virt_build_smbios(VirtGuestInfo *guest_info) > +{ > + FWCfgState *fw_cfg =3D 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); I think the fifth parameter ("uuid_encoded") is incorrect. Please see commit caad057b, and "7.2.1 System =97 UUID" in the SMBIOS 3.0 spec. I didn't specifically verify this earlier, but I have now. It's not right. According to the spec, The UUID {00112233-4455-6677-8899-AABBCCDDEEFF} would thus be represented as: 33 22 11 00 55 44 77 66 88 99 AA BB CC DD EE FF. However, the SMBIOSVIEW command in the UEFI shell returns the following raw hexdump, when -uuid 00112233-4455-6677-8899-AABBCCDDEEFF is passed on the command line: Dump Uuid size=3D16: 00000000: 00 11 22 33 44 55 66 77-88 99 AA BB CC DD EE FF *.."3DUfw........* Otherwise the patch looks fine. Thanks Laszlo > + > + 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 =3D container_of(notifier, > VirtGuestInfoState, mach= ine_done); > virt_acpi_setup(&guest_info_state->info); > + virt_build_smbios(&guest_info_state->info); > } > =20 > static void machvirt_init(MachineState *machine) > @@ -894,6 +920,7 @@ static void machvirt_init(MachineState *machine) > =20 > guest_info->smp_cpus =3D smp_cpus; > guest_info->fw_cfg =3D fw_cfg_find(); > + guest_info->ram_size =3D machine->ram_size; > guest_info->memmap =3D vbi->memmap; > guest_info->irqmap =3D vbi->irqmap; > guest_info_state->machine_done.notify =3D virt_guest_info_machine_= done; > diff --git a/include/hw/arm/virt-acpi-build.h b/include/hw/arm/virt-acp= i-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; >=20