qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Amit Shah <amit.shah@redhat.com>
To: qemu-devel@nongnu.org
Cc: Amit Shah <amit.shah@redhat.com>, agraf@suse.de
Subject: [Qemu-devel] [PATCH 2/3] s390: Add a 0.12 machine type for compatibility
Date: Thu, 25 Feb 2010 19:15:19 +0530	[thread overview]
Message-ID: <1267105520-25457-3-git-send-email-amit.shah@redhat.com> (raw)
In-Reply-To: <1267105520-25457-2-git-send-email-amit.shah@redhat.com>

Add a 0.12 s390-virtio machine type for compatibility with older
versions.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
---
 hw/s390-virtio.c |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index 3582728..a3cbfb6 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -242,7 +242,7 @@ static void s390_init(ram_addr_t ram_size,
 }
 
 static QEMUMachine s390_machine = {
-    .name = "s390-virtio",
+    .name = "s390-virtio-0.13",
     .alias = "s390",
     .desc = "VirtIO based S390 machine",
     .init = s390_init,
@@ -254,9 +254,21 @@ static QEMUMachine s390_machine = {
     .is_default = 1,
 };
 
+static QEMUMachine s390_machine_v0_12 = {
+    .name = "s390-virtio-0.12",
+    .desc = "VirtIO based S390 machine for v0.12 compatibility",
+    .init = s390_init,
+    .no_serial = 1,
+    .no_parallel = 1,
+    .use_virtcon = 1,
+    .no_vga = 1,
+    .max_cpus = 255,
+};
+
 static void s390_machine_init(void)
 {
     qemu_register_machine(&s390_machine);
+    qemu_register_machine(&s390_machine_v0_12);
 }
 
 machine_init(s390_machine_init);
-- 
1.6.2.5

  reply	other threads:[~2010-02-25 13:46 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-25 13:45 [Qemu-devel] [PATCH 0/3] s390: Fix compile, add 0.12 machine type, backward compat Amit Shah
2010-02-25 13:45 ` [Qemu-devel] [PATCH 1/3] s390-virtio: Fix compile error for virtio-block init Amit Shah
2010-02-25 13:45   ` Amit Shah [this message]
2010-02-25 13:45     ` [Qemu-devel] [PATCH 3/3] s390-virtio: Disable new virtio-serial features for 0.12 machine type Amit Shah
2010-03-06 21:55   ` [Qemu-devel] [PATCH 1/3] s390-virtio: Fix compile error for virtio-block init Aurelien Jarno
2010-02-26 11:00 ` [Qemu-devel] Re: [PATCH 0/3] s390: Fix compile, add 0.12 machine type, backward compat Alexander Graf

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=1267105520-25457-3-git-send-email-amit.shah@redhat.com \
    --to=amit.shah@redhat.com \
    --cc=agraf@suse.de \
    --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).