qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Marcelo Tosatti <mtosatti@redhat.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
	Anthony Liguori <aliguori@us.ibm.com>,
	Cole Robinson <crobinso@redhat.com>
Subject: [Qemu-devel] [PATCH] define qemukvm-1.2 machine type
Date: Wed, 12 Dec 2012 20:39:19 -0200	[thread overview]
Message-ID: <20121212223919.GA3190@amt.cnet> (raw)


To allow migration from qemu-kvm-1.2, where cirrus device has 16 megabytes
of RAM.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 19e342a..ead4b6b 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -347,6 +347,26 @@ static QEMUMachine pc_machine_v1_2 = {
     },
 };
 
+#define QEMUKVMPC_COMPAT_1_2 \
+        {\
+            .driver   = "cirrus-vga",\
+            .property = "vgamem_mb",\
+            .value    = "16",\
+        }
+
+static QEMUMachine qemukvmpc_machine_v1_2 = {
+    .name = "qemukvm-pc-1.2",
+    .alias = "pc",
+    .desc = "Standard PC",
+    .init = pc_init_pci,
+    .max_cpus = 255,
+    .compat_props = (GlobalProperty[]) {
+        QEMUKVMPC_COMPAT_1_2,
+        PC_COMPAT_1_2,
+        { /* end of list */ }
+    },
+};
+
 #define PC_COMPAT_1_1 \
         PC_COMPAT_1_2,\
         {\
@@ -645,6 +665,7 @@ static QEMUMachine xenfv_machine = {
 
 static void pc_machine_init(void)
 {
+    qemu_register_machine(&qemukvmpc_machine_v1_2);
     qemu_register_machine(&pc_machine_v1_4);
     qemu_register_machine(&pc_machine_v1_3);
     qemu_register_machine(&pc_machine_v1_2);

             reply	other threads:[~2012-12-12 22:40 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-12 22:39 Marcelo Tosatti [this message]
2012-12-13  8:35 ` [Qemu-devel] [PATCH] define qemukvm-1.2 machine type Paolo Bonzini
2012-12-13 20:29   ` Marcelo Tosatti
2012-12-13 21:25   ` Eduardo Habkost
2012-12-13 21:35     ` Anthony Liguori
2012-12-13 21:41       ` Eduardo Habkost
2012-12-14  7:54         ` Paolo Bonzini
2012-12-14 13:29           ` Anthony Liguori
2012-12-14 13:46             ` Paolo Bonzini
2012-12-13 21:15 ` Anthony Liguori
2013-01-15  3:45 ` Cole Robinson
2013-01-15 16:29   ` Paolo Bonzini
2013-01-16 23:17     ` Cole Robinson
2013-01-18 12:12       ` Marcelo Tosatti
2013-01-18 17:04         ` Cole Robinson
2013-01-18 17:34           ` Paolo Bonzini
2013-01-18 20:09             ` Marcelo Tosatti
2013-01-19 14:17               ` Paolo Bonzini
2013-01-18 19:50           ` Marcelo Tosatti

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=20121212223919.GA3190@amt.cnet \
    --to=mtosatti@redhat.com \
    --cc=aliguori@us.ibm.com \
    --cc=crobinso@redhat.com \
    --cc=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).