yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
218e99
From fb2c8a946384ac07ad74ec3df7ee5906ffbf0b72 Mon Sep 17 00:00:00 2001
218e99
From: Markus Armbruster <armbru@redhat.com>
218e99
Date: Sat, 2 Nov 2013 10:01:27 +0100
218e99
Subject: [PATCH 27/29] smbios: Decouple system product from QEMUMachine
218e99
218e99
RH-Author: Markus Armbruster <armbru@redhat.com>
218e99
Message-id: <1383386488-29789-11-git-send-email-armbru@redhat.com>
218e99
Patchwork-id: 55247
218e99
O-Subject: [PATCH 7.0 qemu-kvm 10/11] smbios: Decouple system product from QEMUMachine
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
Michael Tsirkin doesn't trust us to keep values of QEMUMachine member
218e99
product stable in the future.  Use copies instead, and in a way that
218e99
makes it obvious that they're guest ABI.
218e99
218e99
Note that we can be trusted to keep values of member name, because
218e99
that has always been ABI.
218e99
218e99
Signed-off-by: Markus Armbruster <armbru@redhat.com>
218e99
(cherry picked from pending upstream submission)
218e99
---
218e99
 hw/i386/pc_piix.c | 3 ++-
218e99
 hw/i386/pc_q35.c  | 3 ++-
218e99
 2 files changed, 4 insertions(+), 2 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
 2 files changed, 4 insertions(+), 2 deletions(-)
218e99
218e99
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
218e99
index e8fe607..396f4e4 100644
218e99
--- a/hw/i386/pc_piix.c
218e99
+++ b/hw/i386/pc_piix.c
218e99
@@ -116,7 +116,8 @@ static void pc_init1(QEMUMachineInitArgs *args,
218e99
     }
218e99
 
218e99
     if (smbios_type1_defaults) {
218e99
-        smbios_set_type1_defaults("QEMU", args->machine->desc,
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
     }
218e99
 
218e99
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
218e99
index 3ef854a..473f01b 100644
218e99
--- a/hw/i386/pc_q35.c
218e99
+++ b/hw/i386/pc_q35.c
218e99
@@ -102,7 +102,8 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
218e99
     }
218e99
 
218e99
     if (smbios_type1_defaults) {
218e99
-        smbios_set_type1_defaults("QEMU", args->machine->desc,
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
     }
218e99
 
218e99
-- 
218e99
1.7.1
218e99