|
 |
218e99 |
From 8a7a5d92f6d6e0980e9f4119cdab88fd6e7b83e3 Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
218e99 |
Date: Wed, 6 Nov 2013 09:11:26 +0100
|
|
|
218e99 |
Subject: [PATCH 24/29] smbios: Factor out smbios_maybe_add_str()
|
|
|
218e99 |
|
|
|
218e99 |
RH-Author: Markus Armbruster <armbru@redhat.com>
|
|
|
218e99 |
Message-id: <1383386488-29789-8-git-send-email-armbru@redhat.com>
|
|
|
218e99 |
Patchwork-id: 55248
|
|
|
218e99 |
O-Subject: [PATCH 7.0 qemu-kvm 07/11] smbios: Factor out smbios_maybe_add_str()
|
|
|
218e99 |
Bugzilla: 994490
|
|
|
218e99 |
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
218e99 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
218e99 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
218e99 |
(cherry picked from commit e26d3e734650640fabd7d95ace4f3a6f88725e0b)
|
|
|
218e99 |
---
|
|
|
218e99 |
hw/i386/smbios.c | 61 +++++++++++++++++++++++---------------------------------
|
|
|
218e99 |
1 file changed, 25 insertions(+), 36 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
hw/i386/smbios.c | 61 ++++++++++++++++++++++-------------------------------
|
|
|
218e99 |
1 files changed, 25 insertions(+), 36 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/hw/i386/smbios.c b/hw/i386/smbios.c
|
|
|
218e99 |
index d2dba6c..d3f1ee6 100644
|
|
|
218e99 |
--- a/hw/i386/smbios.c
|
|
|
218e99 |
+++ b/hw/i386/smbios.c
|
|
|
218e99 |
@@ -210,21 +210,22 @@ static void smbios_add_field(int type, int offset, const void *data, size_t len)
|
|
|
218e99 |
cpu_to_le16(le16_to_cpu(*(uint16_t *)smbios_entries) + 1);
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
-static void smbios_build_type_0_fields(void)
|
|
|
218e99 |
+static void smbios_maybe_add_str(int type, int offset, const char *data)
|
|
|
218e99 |
{
|
|
|
218e99 |
- if (type0.vendor) {
|
|
|
218e99 |
- smbios_add_field(0, offsetof(struct smbios_type_0, vendor_str),
|
|
|
218e99 |
- type0.vendor, strlen(type0.vendor) + 1);
|
|
|
218e99 |
- }
|
|
|
218e99 |
- if (type0.version) {
|
|
|
218e99 |
- smbios_add_field(0, offsetof(struct smbios_type_0, bios_version_str),
|
|
|
218e99 |
- type0.version, strlen(type0.version) + 1);
|
|
|
218e99 |
+ if (data) {
|
|
|
218e99 |
+ smbios_add_field(type, offset, data, strlen(data) + 1);
|
|
|
218e99 |
}
|
|
|
218e99 |
- if (type0.date) {
|
|
|
218e99 |
- smbios_add_field(0, offsetof(struct smbios_type_0,
|
|
|
218e99 |
+}
|
|
|
218e99 |
+
|
|
|
218e99 |
+static void smbios_build_type_0_fields(void)
|
|
|
218e99 |
+{
|
|
|
218e99 |
+ smbios_maybe_add_str(0, offsetof(struct smbios_type_0, vendor_str),
|
|
|
218e99 |
+ type0.vendor);
|
|
|
218e99 |
+ smbios_maybe_add_str(0, offsetof(struct smbios_type_0, bios_version_str),
|
|
|
218e99 |
+ type0.version);
|
|
|
218e99 |
+ smbios_maybe_add_str(0, offsetof(struct smbios_type_0,
|
|
|
218e99 |
bios_release_date_str),
|
|
|
218e99 |
- type0.date, strlen(type0.date) + 1);
|
|
|
218e99 |
- }
|
|
|
218e99 |
+ type0.date);
|
|
|
218e99 |
if (type0.have_major_minor) {
|
|
|
218e99 |
smbios_add_field(0, offsetof(struct smbios_type_0,
|
|
|
218e99 |
system_bios_major_release),
|
|
|
218e99 |
@@ -237,30 +238,18 @@ static void smbios_build_type_0_fields(void)
|
|
|
218e99 |
|
|
|
218e99 |
static void smbios_build_type_1_fields(void)
|
|
|
218e99 |
{
|
|
|
218e99 |
- if (type1.manufacturer) {
|
|
|
218e99 |
- smbios_add_field(1, offsetof(struct smbios_type_1, manufacturer_str),
|
|
|
218e99 |
- type1.manufacturer, strlen(type1.manufacturer) + 1);
|
|
|
218e99 |
- }
|
|
|
218e99 |
- if (type1.product) {
|
|
|
218e99 |
- smbios_add_field(1, offsetof(struct smbios_type_1, product_name_str),
|
|
|
218e99 |
- type1.product, strlen(type1.product) + 1);
|
|
|
218e99 |
- }
|
|
|
218e99 |
- if (type1.version) {
|
|
|
218e99 |
- smbios_add_field(1, offsetof(struct smbios_type_1, version_str),
|
|
|
218e99 |
- type1.version, strlen(type1.version) + 1);
|
|
|
218e99 |
- }
|
|
|
218e99 |
- if (type1.serial) {
|
|
|
218e99 |
- smbios_add_field(1, offsetof(struct smbios_type_1, serial_number_str),
|
|
|
218e99 |
- type1.serial, strlen(type1.serial) + 1);
|
|
|
218e99 |
- }
|
|
|
218e99 |
- if (type1.sku) {
|
|
|
218e99 |
- smbios_add_field(1, offsetof(struct smbios_type_1, sku_number_str),
|
|
|
218e99 |
- type1.sku, strlen(type1.sku) + 1);
|
|
|
218e99 |
- }
|
|
|
218e99 |
- if (type1.family) {
|
|
|
218e99 |
- smbios_add_field(1, offsetof(struct smbios_type_1, family_str),
|
|
|
218e99 |
- type1.family, strlen(type1.family) + 1);
|
|
|
218e99 |
- }
|
|
|
218e99 |
+ smbios_maybe_add_str(1, offsetof(struct smbios_type_1, manufacturer_str),
|
|
|
218e99 |
+ type1.manufacturer);
|
|
|
218e99 |
+ smbios_maybe_add_str(1, offsetof(struct smbios_type_1, product_name_str),
|
|
|
218e99 |
+ type1.product);
|
|
|
218e99 |
+ smbios_maybe_add_str(1, offsetof(struct smbios_type_1, version_str),
|
|
|
218e99 |
+ type1.version);
|
|
|
218e99 |
+ smbios_maybe_add_str(1, offsetof(struct smbios_type_1, serial_number_str),
|
|
|
218e99 |
+ type1.serial);
|
|
|
218e99 |
+ smbios_maybe_add_str(1, offsetof(struct smbios_type_1, sku_number_str),
|
|
|
218e99 |
+ type1.sku);
|
|
|
218e99 |
+ smbios_maybe_add_str(1, offsetof(struct smbios_type_1, family_str),
|
|
|
218e99 |
+ type1.family);
|
|
|
218e99 |
if (qemu_uuid_set) {
|
|
|
218e99 |
smbios_add_field(1, offsetof(struct smbios_type_1, uuid),
|
|
|
218e99 |
qemu_uuid, 16);
|
|
|
218e99 |
--
|
|
|
218e99 |
1.7.1
|
|
|
218e99 |
|