|
 |
cd9d16 |
From 60d8ce5610a8b24ff298d6cb3d9abbd2e6f046bd Mon Sep 17 00:00:00 2001
|
|
|
cd9d16 |
From: Anthony Liguori <aliguori@us.ibm.com>
|
|
|
cd9d16 |
Date: Sun, 18 Dec 2011 12:59:12 -0600
|
|
|
cd9d16 |
Subject: [PATCH] pc: add pc-0.15
|
|
|
cd9d16 |
MIME-Version: 1.0
|
|
|
cd9d16 |
Content-Type: text/plain; charset=UTF-8
|
|
|
cd9d16 |
Content-Transfer-Encoding: 8bit
|
|
|
cd9d16 |
|
|
|
cd9d16 |
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
|
|
|
cd9d16 |
(cherry picked from commit ce01a508e8053350544c88ba68a3f90c44b6bb93)
|
|
|
cd9d16 |
|
|
|
cd9d16 |
[BR: bnc#741460]
|
|
|
cd9d16 |
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
|
cd9d16 |
[AF: backported]
|
|
|
cd9d16 |
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
|
cd9d16 |
---
|
|
|
cd9d16 |
hw/pc_piix.c | 26 +++++++++++++++++++++++---
|
|
|
cd9d16 |
1 file changed, 23 insertions(+), 3 deletions(-)
|
|
|
cd9d16 |
|
|
|
cd9d16 |
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
|
|
|
cd9d16 |
index b8e0841..20bac9d 100644
|
|
|
cd9d16 |
--- a/hw/pc_piix.c
|
|
|
cd9d16 |
+++ b/hw/pc_piix.c
|
|
|
cd9d16 |
@@ -258,8 +258,8 @@ static void pc_xen_hvm_init(ram_addr_t ram_size,
|
|
|
cd9d16 |
}
|
|
|
cd9d16 |
#endif
|
|
|
cd9d16 |
|
|
|
cd9d16 |
-static QEMUMachine pc_machine = {
|
|
|
cd9d16 |
- .name = "pc-0.14",
|
|
|
cd9d16 |
+static QEMUMachine pc_machine_v0_15 = {
|
|
|
cd9d16 |
+ .name = "pc-0.15",
|
|
|
cd9d16 |
.alias = "pc",
|
|
|
cd9d16 |
.desc = "Standard PC",
|
|
|
cd9d16 |
.init = pc_init_pci,
|
|
|
cd9d16 |
@@ -267,6 +267,25 @@ static QEMUMachine pc_machine = {
|
|
|
cd9d16 |
.is_default = 1,
|
|
|
cd9d16 |
};
|
|
|
cd9d16 |
|
|
|
cd9d16 |
+static QEMUMachine pc_machine_v0_14 = {
|
|
|
cd9d16 |
+ .name = "pc-0.14",
|
|
|
cd9d16 |
+ .desc = "Standard PC",
|
|
|
cd9d16 |
+ .init = pc_init_pci,
|
|
|
cd9d16 |
+ .max_cpus = 255,
|
|
|
cd9d16 |
+ .compat_props = (GlobalProperty[]) {
|
|
|
cd9d16 |
+ {
|
|
|
cd9d16 |
+ .driver = "qxl",
|
|
|
cd9d16 |
+ .property = "revision",
|
|
|
cd9d16 |
+ .value = stringify(2),
|
|
|
cd9d16 |
+ },{
|
|
|
cd9d16 |
+ .driver = "qxl-vga",
|
|
|
cd9d16 |
+ .property = "revision",
|
|
|
cd9d16 |
+ .value = stringify(2),
|
|
|
cd9d16 |
+ },
|
|
|
cd9d16 |
+ { /* end of list */ }
|
|
|
cd9d16 |
+ },
|
|
|
cd9d16 |
+};
|
|
|
cd9d16 |
+
|
|
|
cd9d16 |
static QEMUMachine pc_machine_v0_13 = {
|
|
|
cd9d16 |
.name = "pc-0.13",
|
|
|
cd9d16 |
.desc = "Standard PC",
|
|
|
cd9d16 |
@@ -498,7 +517,8 @@ static QEMUMachine xenfv_machine = {
|
|
|
cd9d16 |
|
|
|
cd9d16 |
static void pc_machine_init(void)
|
|
|
cd9d16 |
{
|
|
|
cd9d16 |
- qemu_register_machine(&pc_machine);
|
|
|
cd9d16 |
+ qemu_register_machine(&pc_machine_v0_15);
|
|
|
cd9d16 |
+ qemu_register_machine(&pc_machine_v0_14);
|
|
|
cd9d16 |
qemu_register_machine(&pc_machine_v0_13);
|
|
|
cd9d16 |
qemu_register_machine(&pc_machine_v0_12);
|
|
|
cd9d16 |
qemu_register_machine(&pc_machine_v0_11);
|
|
|
cd9d16 |
--
|
|
|
cd9d16 |
1.7.11.2
|
|
|
cd9d16 |
|