From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58228) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c3mpK-0003LL-Gj for qemu-devel@nongnu.org; Mon, 07 Nov 2016 11:31:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c3mpG-00084w-P3 for qemu-devel@nongnu.org; Mon, 07 Nov 2016 11:31:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33030) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c3mpG-00084q-I2 for qemu-devel@nongnu.org; Mon, 07 Nov 2016 11:31:14 -0500 Date: Mon, 7 Nov 2016 16:31:10 +0000 From: "Daniel P. Berrange" Message-ID: <20161107163110.GB19422@redhat.com> Reply-To: "Daniel P. Berrange" References: <20160906082833.25428-1-lma@suse.com> <58211B8102000062000AE074@prv-mh.provo.novell.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <58211B8102000062000AE074@prv-mh.provo.novell.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] =?utf-8?b?562U5aSN77yaICBbUEFUQ0hdIHNtYmlvczogQWRk?= =?utf-8?q?_1_terminator_if_there_is_any_string_field_defined_in_given_tab?= =?utf-8?b?bGUu?= List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Lin Ma Cc: qemu-devel@nongnu.org, imammedo@redhat.com, mst@redhat.com On Mon, Nov 07, 2016 at 09:25:37AM -0700, Lin Ma wrote: > Ping. >=20 > >>> Lin Ma 2016/9/6 =E6=98=9F=E6=9C=9F=E4=BA=8C =E4=B8=8B= =E5=8D=88 4:28 >>> > If user specifies binary file on command line to load smbios entries, t= hen > will get error messages while decoding them in guest. >=20 > Reproducer: > 1. dump a smbios table to a binary file from host or guest.(says table = 1) > 2. load the binary file through command line: 'qemu -smbios file=3D...'= . > 3. perform 'dmidecode' or 'dmidecode -t 1' in guest. >=20 > It reports 'Invalid entry length...' because qemu doesn't add terminato= r(s) for > the table correctly. > For smbios tables which have string field provided, qemu should add 1 t= erminator. > For smbios tables which dont have string field provided, qemu should ad= d 2. >=20 > This patch fixed the issue. >=20 > Signed-off-by: Lin Ma > --- > hw/smbios/smbios.c | 90 +++++++++++++++++++++++++++++++++++++++++++++= + > include/hw/smbios/smbios.h | 44 +++++++++++++++++++++++ > 2 files changed, 134 insertions(+) >=20 > diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c > index 74c7102..6293bc5 100644 > --- a/hw/smbios/smbios.c > +++ b/hw/smbios/smbios.c > @@ -885,6 +885,9 @@ void smbios_entry_add(QemuOpts *opts) > { > const char *val; >=20 > + int i, terminator_count =3D 2, table_str_field_count =3D 0; > + int *tables_str_field_offset =3D NULL; > + > assert(!smbios_immutable); >=20 > val =3D qemu_opt_get(opts, "file"); > @@ -926,7 +929,94 @@ void smbios_entry_add(QemuOpts *opts) > smbios_type4_count++; > } >=20 > + switch (header->type) { > + case 0: > + tables_str_field_offset =3D g_malloc0(sizeof(int) * \ > + TYPE_0_STR_FIELD_COUNT); > + tables_str_field_offset =3D (int []){\ > + TYPE_0_STR_FIELD_OFFSET_VENDOR, \ > + TYPE_0_STR_FIELD_OFFSET_BIOS_VERSION, \ > + TYPE_0_STR_FIELD_OFFSET_BIOS_RELEASE_DATE}; > + table_str_field_count =3D sizeof(tables_str_field_offset) / \ > + sizeof(tables_str_field_offset[0]); > + break; > + case 1: > + tables_str_field_offset =3D g_malloc0(sizeof(int) * \ > + TYPE_1_STR_FIELD_COUNT); > + tables_str_field_offset =3D (int []){ > + TYPE_1_STR_FIELD_OFFSET_MANUFACTURER, \ > + TYPE_1_STR_FIELD_OFFSET_PRODUCT, \ > + TYPE_1_STR_FIELD_OFFSET_VERSION, \ > + TYPE_1_STR_FIELD_OFFSET_SERIAL, \ > + TYPE_1_STR_FIELD_OFFSET_SKU, \ > + TYPE_1_STR_FIELD_OFFSET_FAMILY}; > + table_str_field_count =3D sizeof(tables_str_field_offset) / \ > + sizeof(tables_str_field_offset[0]); > + break; > + case 2: > + tables_str_field_offset =3D g_malloc0(sizeof(int) * \ > + TYPE_2_STR_FIELD_COUNT); > + tables_str_field_offset =3D (int []){\ > + TYPE_2_STR_FIELD_OFFSET_MANUFACTURER, \ > + TYPE_2_STR_FIELD_OFFSET_PRODUCT, \ > + TYPE_2_STR_FIELD_OFFSET_VERSION, \ > + TYPE_2_STR_FIELD_OFFSET_SERIAL, \ > + TYPE_2_STR_FIELD_OFFSET_ASSET, \ > + TYPE_2_STR_FIELD_OFFSET_LOCATION}; > + table_str_field_count =3D sizeof(tables_str_field_offset) / \ > + sizeof(tables_str_field_offset[0]); > + break; > + case 3: > + tables_str_field_offset =3D g_malloc0(sizeof(int) * \ > + TYPE_3_STR_FIELD_COUNT); > + tables_str_field_offset =3D (int []){\ > + TYPE_3_STR_FIELD_OFFSET_MANUFACTURER, \ > + TYPE_3_STR_FIELD_OFFSET_VERSION, \ > + TYPE_3_STR_FIELD_OFFSET_SERIAL, \ > + TYPE_3_STR_FIELD_OFFSET_ASSET, \ > + TYPE_3_STR_FIELD_OFFSET_SKU}; > + table_str_field_count =3D sizeof(tables_str_field_offset) / \ > + sizeof(tables_str_field_offset[0]); > + break; > + case 4: > + tables_str_field_offset =3D g_malloc0(sizeof(int) * \ > + TYPE_4_STR_FIELD_COUNT); > + tables_str_field_offset =3D (int []){\ > + TYPE_4_STR_FIELD_OFFSET_SOCKET, \ > + TYPE_4_STR_FIELD_OFFSET_PROCESSOR_MANUFACTURER, \ > + TYPE_4_STR_FIELD_OFFSET_PROCESSOR_VERSION, \ > + TYPE_4_STR_FIELD_OFFSET_SERIAL, \ > + TYPE_4_STR_FIELD_OFFSET_ASSET, \ > + > TYPE_4_STR_FIELD_OFFSET_PART}; > + table_str_field_count =3D sizeof(tables_str_field_offset) / \ > + sizeof(tables_str_field_offset[0]); > + break; > + case 17: > + tables_str_field_offset =3D g_malloc0(sizeof(int) * \ > + TYPE_17_STR_FIELD_COUNT); > + tables_str_field_offset =3D (int []){\ > + TYPE_17_STR_FIELD_OFFSET_DEVICE_LOCATOR, \ > + TYPE_17_STR_FIELD_OFFSET_BANK_LOCATOR, \ > + TYPE_17_STR_FIELD_OFFSET_MANUFACTURER, \ > + TYPE_17_STR_FIELD_OFFSET_SERIAL, \ > + TYPE_17_STR_FIELD_OFFSET_ASSET, \ > + TYPE_17_STR_FIELD_OFFSET_PART}; > + table_str_field_count =3D sizeof(tables_str_field_offset) / \ > + sizeof(tables_str_field_offset[0]); > + break; > + default: > + break; > + } > + > + for (i =3D 0; i < table_str_field_count; i++) { > + if (*(uint8_t *)(smbios_tables + tables_str_field_offset[i]) > 0= ) { > + terminator_count =3D 1; > + break; > + } > + } > + > smbios_tables_len +=3D size; > + smbios_tables_len +=3D terminator_count; > if (size > smbios_table_max) { > smbios_table_max =3D size; > } Code identation is this patch looks totally mangled. Regards, Daniel --=20 |: http://berrange.com -o- http://www.flickr.com/photos/dberrange= / :| |: http://libvirt.org -o- http://virt-manager.or= g :| |: http://entangle-photo.org -o- http://search.cpan.org/~danberr= / :|