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] [RFC PATCH 2/4] add pc-0.14 machine
Date: Thu, 30 Jun 2011 17:46:15 +0200	[thread overview]
Message-ID: <1309448777-1447-3-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1309448777-1447-1-git-send-email-pbonzini@redhat.com>

The new pc-0.15 machine will have a different migration format, so
define the compatibility one right now.

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

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index c5c16b4..18cc942 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -258,7 +258,7 @@ static void pc_xen_hvm_init(ram_addr_t ram_size,
 #endif
 
 static QEMUMachine pc_machine = {
-    .name = "pc-0.14",
+    .name = "pc-0.15",
     .alias = "pc",
     .desc = "Standard PC",
     .init = pc_init_pci,
@@ -266,6 +266,13 @@ static QEMUMachine pc_machine = {
     .is_default = 1,
 };
 
+static QEMUMachine pc_machine_v0_14 = {
+    .name = "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",
@@ -482,6 +489,7 @@ static QEMUMachine xenfv_machine = {
 static void pc_machine_init(void)
 {
     qemu_register_machine(&pc_machine);
+    qemu_register_machine(&pc_machine_v0_14);
     qemu_register_machine(&pc_machine_v0_13);
     qemu_register_machine(&pc_machine_v0_12);
     qemu_register_machine(&pc_machine_v0_11);
-- 
1.7.5.2

  parent reply	other threads:[~2011-06-30 15:46 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-30 15:46 [Qemu-devel] [RFC PATCH 0/4] Fix subsection ambiguity in the migration format Paolo Bonzini
2011-06-30 15:46 ` [Qemu-devel] [RFC PATCH 1/4] add support for machine models to specify their " Paolo Bonzini
2011-06-30 18:11   ` Michael S. Tsirkin
2011-07-01  6:10     ` Paolo Bonzini
2011-07-29 13:08   ` Anthony Liguori
2011-07-29 14:35     ` Paolo Bonzini
2011-06-30 15:46 ` Paolo Bonzini [this message]
2011-08-05 19:26   ` [Qemu-devel] [RFC PATCH 2/4] add pc-0.14 machine Bruce Rogers
2011-08-05 19:41     ` Anthony Liguori
2011-06-30 15:46 ` [Qemu-devel] [RFC PATCH 3/4] savevm: define new unambiguous migration format Paolo Bonzini
2011-07-29 13:12   ` Anthony Liguori
2011-07-29 14:35     ` Paolo Bonzini
2011-06-30 15:46 ` [Qemu-devel] [RFC PATCH 4/4] Partially revert "savevm: fix corruption in vmstate_subsection_load()." Paolo Bonzini
2011-07-25 21:10 ` [Qemu-devel] [RFC PATCH 0/4] Fix subsection ambiguity in the migration format Paolo Bonzini
2011-07-25 23:23   ` Anthony Liguori
2011-07-26  9:42     ` Daniel P. Berrange
2011-07-26  9:48     ` Stefan Hajnoczi
2011-07-26 12:51       ` Stefan Hajnoczi
2011-07-26 13:00         ` Anthony Liguori
2011-07-26 12:07     ` Juan Quintela
2011-07-26 12:37       ` Anthony Liguori
2011-07-26 20:13         ` Juan Quintela
2011-07-26 21:46           ` Anthony Liguori
2011-07-26 22:22             ` Peter Maydell
2011-07-26 23:08               ` Anthony Liguori
2011-07-29 14:03         ` Kevin Wolf
2011-07-29 14:28           ` Anthony Liguori
2011-07-29 15:18             ` Kevin Wolf
2011-07-29 22:28               ` Anthony Liguori
2011-07-31 10:48                 ` Dor Laor
2011-07-31 11:37                   ` Peter Maydell
2011-07-31 11:45                     ` Dor Laor
2011-07-31 18:46                       ` Christoph Hellwig
2011-07-31 20:43                         ` Dor Laor
2011-07-31 20:55                           ` Anthony Liguori
2011-07-31 23:10                           ` Christoph Hellwig
2011-08-01  0:15                             ` Anthony Liguori
2011-08-01  7:54                               ` Christoph Hellwig
2011-08-01 13:53                                 ` Anthony Liguori
2011-08-04 14:59                                   ` Luiz Capitulino
2011-07-31 20:43                   ` Anthony Liguori
2011-07-31 20:57                     ` Dor Laor
2011-07-31 21:03                       ` Anthony Liguori
2011-07-31 21:25                         ` Dor Laor
2011-07-31 21:49                           ` Anthony Liguori
2011-07-29 13:14   ` Anthony Liguori
2011-07-29 14:49     ` 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=1309448777-1447-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).