summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2012-12-04 14:39:16 +0100
committerGerd Hoffmann <kraxel@redhat.com>2012-12-04 14:41:54 +0100
commitf1ae2e3883c4ee3a9f91f484690abe42f5063d64 (patch)
tree222ccfa3541636fbe764cf605624d22773b305f5
parent16c6c80ac3a772b42a87b77dfdf0fdac7c607b0e (diff)
downloadfocaccia-qemu-f1ae2e3883c4ee3a9f91f484690abe42f5063d64.tar.gz
focaccia-qemu-f1ae2e3883c4ee3a9f91f484690abe42f5063d64.zip
add pc-1.4
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--hw/pc_piix.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index aa3e7f40dc..040cd079ed 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -281,8 +281,8 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args)
 }
 #endif
 
-static QEMUMachine pc_machine_v1_3 = {
-    .name = "pc-1.3",
+static QEMUMachine pc_machine_v1_4 = {
+    .name = "pc-1.4",
     .alias = "pc",
     .desc = "Standard PC",
     .init = pc_init_pci_1_3,
@@ -290,6 +290,16 @@ static QEMUMachine pc_machine_v1_3 = {
     .is_default = 1,
 };
 
+static QEMUMachine pc_machine_v1_3 = {
+    .name = "pc-1.3",
+    .desc = "Standard PC",
+    .init = pc_init_pci_1_3,
+    .max_cpus = 255,
+    .compat_props = (GlobalProperty[]) {
+        { /* end of list */ }
+    },
+};
+
 #define PC_COMPAT_1_2 \
         {\
             .driver   = "nec-usb-xhci",\
@@ -626,6 +636,7 @@ static QEMUMachine xenfv_machine = {
 
 static void pc_machine_init(void)
 {
+    qemu_register_machine(&pc_machine_v1_4);
     qemu_register_machine(&pc_machine_v1_3);
     qemu_register_machine(&pc_machine_v1_2);
     qemu_register_machine(&pc_machine_v1_1);