Patchwork [v3,2/4] add pc-0.14/pc-0.15 machine

login
register
mail settings
Submitter Paolo Bonzini
Date Aug. 12, 2011, 9:59 a.m.
Message ID <1313143181-7921-3-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/109809/
State New
Headers show

Comments

Paolo Bonzini - Aug. 12, 2011, 9:59 a.m.
The new pc-1.0 machine will have a different migration format, so
define the compatibility one right now.  Alias it to pc-0.14, since
they are the same.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/pc_piix.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

Patch

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index c0a2abe..88a5f3b 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -270,7 +270,7 @@  static void pc_xen_hvm_init(ram_addr_t ram_size,
 #endif
 
 static QEMUMachine pc_machine = {
-    .name = "pc-0.14",
+    .name = "pc-1.0",
     .alias = "pc",
     .desc = "Standard PC",
     .init = pc_init_pci,
@@ -278,6 +278,14 @@  static QEMUMachine pc_machine = {
     .is_default = 1,
 };
 
+static QEMUMachine pc_machine_v0_15 = {
+    .name = "pc-0.15",
+    .alias = "pc-0.14",
+    .desc = "Standard PC",
+    .init = pc_init_pci,
+    .max_cpus = 255,
+};
+
 static QEMUMachine pc_machine_v0_13 = {
     .name = "pc-0.13",
     .desc = "Standard PC",
@@ -494,6 +502,7 @@  static QEMUMachine xenfv_machine = {
 static void pc_machine_init(void)
 {
     qemu_register_machine(&pc_machine);
+    qemu_register_machine(&pc_machine_v0_15);
     qemu_register_machine(&pc_machine_v0_13);
     qemu_register_machine(&pc_machine_v0_12);
     qemu_register_machine(&pc_machine_v0_11);