* [Qemu-devel] [PATCH 1/1] mach-virt: Set VM's SMBIOS system version to mc->name
@ 2017-09-22 13:51 Wei Huang
2017-09-26 10:54 ` Andrew Jones
0 siblings, 1 reply; 6+ messages in thread
From: Wei Huang @ 2017-09-22 13:51 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-arm, peter.maydell
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 <wei@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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH 1/1] mach-virt: Set VM's SMBIOS system version to mc->name
2017-09-22 13:51 [Qemu-devel] [PATCH 1/1] mach-virt: Set VM's SMBIOS system version to mc->name Wei Huang
@ 2017-09-26 10:54 ` Andrew Jones
2017-09-26 15:28 ` Peter Maydell
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Jones @ 2017-09-26 10:54 UTC (permalink / raw)
To: Wei Huang; +Cc: qemu-devel, peter.maydell, qemu-arm
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 <wei@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 <drjones@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH 1/1] mach-virt: Set VM's SMBIOS system version to mc->name
2017-09-26 10:54 ` Andrew Jones
@ 2017-09-26 15:28 ` Peter Maydell
2017-09-26 15:37 ` Andrew Jones
0 siblings, 1 reply; 6+ messages in thread
From: Peter Maydell @ 2017-09-26 15:28 UTC (permalink / raw)
To: Andrew Jones; +Cc: Wei Huang, QEMU Developers, qemu-arm
On 26 September 2017 at 11:54, Andrew Jones <drjones@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 <wei@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 <drjones@redhat.com>
Are we OK to change this without having to tie it to the machine
version number?
thanks
-- PMM
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH 1/1] mach-virt: Set VM's SMBIOS system version to mc->name
2017-09-26 15:28 ` Peter Maydell
@ 2017-09-26 15:37 ` Andrew Jones
2017-09-26 16:52 ` Wei Huang
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Jones @ 2017-09-26 15:37 UTC (permalink / raw)
To: Peter Maydell; +Cc: Wei Huang, QEMU Developers, qemu-arm, eric.auger
On Tue, Sep 26, 2017 at 04:28:03PM +0100, Peter Maydell wrote:
> On 26 September 2017 at 11:54, Andrew Jones <drjones@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 <wei@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 <drjones@redhat.com>
>
> Are we OK to change this without having to tie it to the machine
> version number?
Let's tie it to be safe. Eric has a 2.11 machine version patch in his
virtio-iommu series, but, like for 2.10, he or Wei should probably just
post that independently to make sure it gets in.
Wei, will you post the 2.11 version patch?
Thanks,
drew
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH 1/1] mach-virt: Set VM's SMBIOS system version to mc->name
2017-09-26 15:37 ` Andrew Jones
@ 2017-09-26 16:52 ` Wei Huang
2017-09-27 8:59 ` Auger Eric
0 siblings, 1 reply; 6+ messages in thread
From: Wei Huang @ 2017-09-26 16:52 UTC (permalink / raw)
To: Andrew Jones, Peter Maydell; +Cc: QEMU Developers, qemu-arm, eric.auger
On 09/26/2017 10:37 AM, Andrew Jones wrote:
> On Tue, Sep 26, 2017 at 04:28:03PM +0100, Peter Maydell wrote:
>> On 26 September 2017 at 11:54, Andrew Jones <drjones@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 <wei@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 <drjones@redhat.com>
>>
>> Are we OK to change this without having to tie it to the machine
>> version number?
>
> Let's tie it to be safe. Eric has a 2.11 machine version patch in his
> virtio-iommu series, but, like for 2.10, he or Wei should probably just
> post that independently to make sure it gets in.
>
> Wei, will you post the 2.11 version patch?
Will do
>
> Thanks,
> drew
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH 1/1] mach-virt: Set VM's SMBIOS system version to mc->name
2017-09-26 16:52 ` Wei Huang
@ 2017-09-27 8:59 ` Auger Eric
0 siblings, 0 replies; 6+ messages in thread
From: Auger Eric @ 2017-09-27 8:59 UTC (permalink / raw)
To: Wei Huang, Andrew Jones, Peter Maydell; +Cc: qemu-arm, QEMU Developers
Hi Wei,
On 26/09/2017 18:52, Wei Huang wrote:
>
>
> On 09/26/2017 10:37 AM, Andrew Jones wrote:
>> On Tue, Sep 26, 2017 at 04:28:03PM +0100, Peter Maydell wrote:
>>> On 26 September 2017 at 11:54, Andrew Jones <drjones@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 <wei@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 <drjones@redhat.com>
>>>
>>> Are we OK to change this without having to tie it to the machine
>>> version number?
>>
>> Let's tie it to be safe. Eric has a 2.11 machine version patch in his
>> virtio-iommu series, but, like for 2.10, he or Wei should probably just
>> post that independently to make sure it gets in.
>>
>> Wei, will you post the 2.11 version patch?
>
> Will do
yep, feel free to reuse my patch and remove the noiommu field.
Thanks
Eric
>
>>
>> Thanks,
>> drew
>>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-09-27 8:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-22 13:51 [Qemu-devel] [PATCH 1/1] mach-virt: Set VM's SMBIOS system version to mc->name Wei Huang
2017-09-26 10:54 ` Andrew Jones
2017-09-26 15:28 ` Peter Maydell
2017-09-26 15:37 ` Andrew Jones
2017-09-26 16:52 ` Wei Huang
2017-09-27 8:59 ` Auger Eric
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.