qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH v3 2/4] add pc-0.14/pc-0.15 machine
Date: Fri, 12 Aug 2011 11:59:39 +0200	[thread overview]
Message-ID: <1313143181-7921-3-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1313143181-7921-1-git-send-email-pbonzini@redhat.com>

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(-)

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);
-- 
1.7.6

  parent reply	other threads:[~2011-08-12 10:02 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-12  9:59 [Qemu-devel] [PATCH v3 0/4] Fix subsection ambiguity in the migration format Paolo Bonzini
2011-08-12  9:59 ` [Qemu-devel] [PATCH v3 1/4] add support for machine models to specify their " Paolo Bonzini
2011-08-12  9:59 ` Paolo Bonzini [this message]
2011-08-12  9:59 ` [Qemu-devel] [PATCH v3 3/4] savevm: define new unambiguous " Paolo Bonzini
2011-08-12 15:11   ` Anthony Liguori
2011-08-12 15:16     ` Anthony Liguori
2011-08-12 15:46       ` Paolo Bonzini
2011-08-12  9:59 ` [Qemu-devel] [PATCH v3 4/4] Partially revert "savevm: fix corruption in vmstate_subsection_load()." Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1313143181-7921-3-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).