On 26 September 2017 at 11:54, Andrew Jones <drjo...@redhat.com> wrote:
> On Fri, Sep 22, 2017 at 08:51:15AM -0500, Wei Huang wrote:
>> Instead of using "1.0" as the system version of SMBIOS, we should use
>> mc->name for mach-virt machine type. This matches with x86 code and
>> prevents the smbios_table.machine_type test of Avocado from failing.
>>
>> Signed-off-by: Wei Huang <w...@redhat.com>
>> ---
>> hw/arm/virt.c | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
>> index 9e18b41..8d0c6a9 100644
>> --- a/hw/arm/virt.c
>> +++ b/hw/arm/virt.c
>> @@ -1189,6 +1189,7 @@ static void *machvirt_dtb(const struct arm_boot_info
>> *binfo, int *fdt_size)
>>
>> static void virt_build_smbios(VirtMachineState *vms)
>> {
>> + MachineClass *mc = MACHINE_GET_CLASS(vms);
>> uint8_t *smbios_tables, *smbios_anchor;
>> size_t smbios_tables_len, smbios_anchor_len;
>> const char *product = "QEMU Virtual Machine";
>> @@ -1202,7 +1203,7 @@ static void virt_build_smbios(VirtMachineState *vms)
>> }
>>
>> smbios_set_defaults("QEMU", product,
>> - "1.0", false, true, SMBIOS_ENTRY_POINT_30);
>> + mc->name, false, true, SMBIOS_ENTRY_POINT_30);
>>
>> smbios_get_tables(NULL, 0, &smbios_tables, &smbios_tables_len,
>> &smbios_anchor, &smbios_anchor_len);
>> --
>> 2.7.5
>>
>>
>
> Reviewed-by: Andrew Jones <drjo...@redhat.com>
Are we OK to change this without having to tie it to the machine
version number?
thanks
-- PMM
