218e99
From 13f5bfee8de72bc90324d84cba85850c66c001ed Mon Sep 17 00:00:00 2001
218e99
From: Markus Armbruster <armbru@redhat.com>
218e99
Date: Sat, 2 Nov 2013 10:01:28 +0100
218e99
Subject: [PATCH 28/29] rhel: SMBIOS type 1 branding
218e99
218e99
RH-Author: Markus Armbruster <armbru@redhat.com>
218e99
Message-id: <1383386488-29789-12-git-send-email-armbru@redhat.com>
218e99
Patchwork-id: 55242
218e99
O-Subject: [PATCH 7.0 qemu-kvm 11/11] rhel: SMBIOS type 1 branding
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
The previous two commits got us the upstreamable parts of RHEL-6
218e99
commit 68c63bd "per-machine-type smbios Type 1 smbios values".  This
218e99
is the RHEL-only part.
218e99
218e99
Note: RHEL-6 also has commit 8e0d71e "Set SMBIOS vendor to QEMU for
218e99
RHEL5 machine types.", which RHEL-7 doesn't need, because it doesn't
218e99
have RHEL-5 machine types.
218e99
218e99
Signed-off-by: Markus Armbruster <armbru@redhat.com>
218e99
---
218e99
 hw/i386/pc_piix.c | 3 +--
218e99
 hw/i386/pc_q35.c  | 3 +--
218e99
 hw/i386/smbios.c  | 3 +++
218e99
 3 files changed, 5 insertions(+), 4 deletions(-)
218e99
218e99
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
---
218e99
 hw/i386/pc_piix.c |    3 +--
218e99
 hw/i386/pc_q35.c  |    3 +--
218e99
 hw/i386/smbios.c  |    3 +++
218e99
 3 files changed, 5 insertions(+), 4 deletions(-)
218e99
218e99
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
218e99
index 396f4e4..825a5b1 100644
218e99
--- a/hw/i386/pc_piix.c
218e99
+++ b/hw/i386/pc_piix.c
218e99
@@ -117,8 +117,7 @@ static void pc_init1(QEMUMachineInitArgs *args,
218e99
 
218e99
     if (smbios_type1_defaults) {
218e99
         /* These values are guest ABI, do not change */
218e99
-        smbios_set_type1_defaults("QEMU", "Standard PC (i440FX + PIIX, 1996)",
218e99
-                                  args->machine->name);
218e99
+        smbios_set_type1_defaults("Red Hat", "KVM", args->machine->desc);
218e99
     }
218e99
 
218e99
     /* allocate ram and load rom/bios */
218e99
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
218e99
index 473f01b..64995ac 100644
218e99
--- a/hw/i386/pc_q35.c
218e99
+++ b/hw/i386/pc_q35.c
218e99
@@ -103,8 +103,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
218e99
 
218e99
     if (smbios_type1_defaults) {
218e99
         /* These values are guest ABI, do not change */
218e99
-        smbios_set_type1_defaults("QEMU", "Standard PC (Q35 + ICH9, 2009)",
218e99
-                                  args->machine->name);
218e99
+        smbios_set_type1_defaults("Red Hat", "KVM", args->machine->desc);
218e99
     }
218e99
 
218e99
     /* allocate ram and load rom/bios */
218e99
diff --git a/hw/i386/smbios.c b/hw/i386/smbios.c
218e99
index e8f41ad..60aa62e 100644
218e99
--- a/hw/i386/smbios.c
218e99
+++ b/hw/i386/smbios.c
218e99
@@ -268,6 +268,9 @@ void smbios_set_type1_defaults(const char *manufacturer,
218e99
     if (!type1.version) {
218e99
         type1.version = version;
218e99
     }
218e99
+    if (!type1.family) {
218e99
+        type1.family = "Red Hat Enterprise Linux";
218e99
+    }
218e99
 }
218e99
 
218e99
 uint8_t *smbios_get_table(size_t *length)
218e99
-- 
218e99
1.7.1
218e99