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