]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
hw/pc_piix: add pc-1.1
authorJordan Justen <jordan.l.justen@intel.com>
Wed, 22 Feb 2012 07:18:55 +0000 (23:18 -0800)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 22 Feb 2012 15:02:18 +0000 (09:02 -0600)
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
hw/pc_piix.c

index 2fc42117d0c96ce64e9ba2547012ce52f678dcd8..fcf0153d377f5c77240b851910db361c8cd1d8f2 100644 (file)
@@ -371,8 +371,8 @@ static void pc_xen_hvm_init(ram_addr_t ram_size,
 }
 #endif
 
-static QEMUMachine pc_machine_v1_0 = {
-    .name = "pc-1.0",
+static QEMUMachine pc_machine_v1_1 = {
+    .name = "pc-1.1",
     .alias = "pc",
     .desc = "Standard PC",
     .init = pc_init_pci,
@@ -380,6 +380,13 @@ static QEMUMachine pc_machine_v1_0 = {
     .is_default = 1,
 };
 
+static QEMUMachine pc_machine_v1_0 = {
+    .name = "pc-1.0",
+    .desc = "Standard PC",
+    .init = pc_init_pci,
+    .max_cpus = 255,
+};
+
 static QEMUMachine pc_machine_v0_15 = {
     .name = "pc-0.15",
     .desc = "Standard PC",
@@ -669,6 +676,7 @@ static QEMUMachine xenfv_machine = {
 
 static void pc_machine_init(void)
 {
+    qemu_register_machine(&pc_machine_v1_1);
     qemu_register_machine(&pc_machine_v1_0);
     qemu_register_machine(&pc_machine_v0_15);
     qemu_register_machine(&pc_machine_v0_14);