From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51414) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ez0h6-00004r-VL for qemu-devel@nongnu.org; Thu, 22 Mar 2018 09:55:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ez0h3-0007aI-0s for qemu-devel@nongnu.org; Thu, 22 Mar 2018 09:55:53 -0400 Date: Thu, 22 Mar 2018 13:55:34 +0000 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Message-ID: <20180322135534.GQ3583@redhat.com> Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= References: <20180322031216.14569-1-wei@redhat.com> <20180322110712.GN3583@redhat.com> <20180322134935.n5u6aitfrfl2ppts@hawk.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20180322134935.n5u6aitfrfl2ppts@hawk.localdomain> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 1/1] mach-virt: Set VM's SMBIOS system version to mc->desc List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Andrew Jones Cc: Wei Huang , peter.maydell@linaro.org, qemu-arm@nongnu.org, qemu-devel@nongnu.org On Thu, Mar 22, 2018 at 02:49:35PM +0100, Andrew Jones wrote: > On Thu, Mar 22, 2018 at 11:07:12AM +0000, Daniel P. Berrang=C3=A9 wrote= : > > On Wed, Mar 21, 2018 at 10:12:16PM -0500, Wei Huang wrote: > > > Instead of using "1.0" as the system version of SMBIOS, we should u= se > > > mc->desc for mach-virt machine type. With this patch, "dmidecode -t= 1" > > > (e.g., "-M virt-2.12,accel=3Dkvm") will show: > > >=20 > > > Handle 0x0100, DMI type 1, 27 bytes > > > System Information > > > Manufacturer: QEMU > > > Product Name: KVM Virtual Machine > > > Version: QEMU 2.12 ARM Virtual Machine > > > Serial Number: Not Specified > > > ... > > >=20 > > > instead of: > > > Handle 0x0100, DMI type 1, 27 bytes > > > System Information > > > Manufacturer: QEMU > > > Product Name: KVM Virtual Machine > > > Version: 1.0 > > > Serial Number: Not Specified > > > ... > > >=20 > > > Signed-off-by: Wei Huang > > > --- > > > hw/arm/virt.c | 3 ++- > > > 1 file changed, 2 insertions(+), 1 deletion(-) > > >=20 > > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > > > index 2c07245047..da7228b297 100644 > > > --- a/hw/arm/virt.c > > > +++ b/hw/arm/virt.c > > > @@ -1132,6 +1132,7 @@ static void *machvirt_dtb(const struct arm_bo= ot_info *binfo, int *fdt_size) > > > =20 > > > static void virt_build_smbios(VirtMachineState *vms) > > > { > > > + MachineClass *mc =3D MACHINE_GET_CLASS(vms); > > > uint8_t *smbios_tables, *smbios_anchor; > > > size_t smbios_tables_len, smbios_anchor_len; > > > const char *product =3D "QEMU Virtual Machine"; > > > @@ -1145,7 +1146,7 @@ static void virt_build_smbios(VirtMachineStat= e *vms) > > > } > > > =20 > > > smbios_set_defaults("QEMU", product, > > > - "1.0", false, true, SMBIOS_ENTRY_POINT_30)= ; > > > + mc->desc, false, true, SMBIOS_ENTRY_POINT_= 30); > >=20 > > Surely this needs to be handled in back compatible manner so that exi= sting > > machine types are not changed - only the new virt-2.12 machine type s= hould > > get new format. >=20 > On real hardware this table can change when there's a firmware update, > so I don't think any OS would expect it to stay the same across reboots= . > I also can't imagine any applications caring at all about this, > particularly because it's currently the useless "1.0" string. I think > we're safe to neglect compat code in this case, but I may be missing > something. Is there a particular issue you're aware of that we'd risk > hitting? (Well, besides Windows detecting its installation machine has > "changed", invalidating its license or whatever. We don't yet have any > Windows guests to worry about.) I don't have a particular scenario in mind - just the general rule that we don't change something which is guest visible without tieing it to machine type. I guess we've not tied machine types to specific SeaBIOS / UEFI snapshot builds though, so in terms of firmware changing we've already got that scenario. Regards, Daniel --=20 |: https://berrange.com -o- https://www.flickr.com/photos/dberran= ge :| |: https://libvirt.org -o- https://fstop138.berrange.c= om :| |: https://entangle-photo.org -o- https://www.instagram.com/dberran= ge :|