From patchwork Thu Feb 25 13:45:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 46236 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 838A4B7080 for ; Fri, 26 Feb 2010 00:55:13 +1100 (EST) Received: from localhost ([127.0.0.1]:52514 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nke5t-0007vq-JS for incoming@patchwork.ozlabs.org; Thu, 25 Feb 2010 08:49:33 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nke3D-0007XE-Ow for qemu-devel@nongnu.org; Thu, 25 Feb 2010 08:46:47 -0500 Received: from [199.232.76.173] (port=48903 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nke3D-0007Wn-AE for qemu-devel@nongnu.org; Thu, 25 Feb 2010 08:46:47 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nke3C-0000uZ-3K for qemu-devel@nongnu.org; Thu, 25 Feb 2010 08:46:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:32954) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nke3B-0000uH-Lf for qemu-devel@nongnu.org; Thu, 25 Feb 2010 08:46:45 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o1PDkiTs024705 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 25 Feb 2010 08:46:44 -0500 Received: from localhost (vpn-233-100.phx2.redhat.com [10.3.233.100]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o1PDkhCX013826; Thu, 25 Feb 2010 08:46:43 -0500 From: Amit Shah To: qemu-devel@nongnu.org Date: Thu, 25 Feb 2010 19:15:19 +0530 Message-Id: <1267105520-25457-3-git-send-email-amit.shah@redhat.com> In-Reply-To: <1267105520-25457-2-git-send-email-amit.shah@redhat.com> References: <1267105520-25457-1-git-send-email-amit.shah@redhat.com> <1267105520-25457-2-git-send-email-amit.shah@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Amit Shah , agraf@suse.de Subject: [Qemu-devel] [PATCH 2/3] s390: Add a 0.12 machine type for compatibility X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add a 0.12 s390-virtio machine type for compatibility with older versions. Signed-off-by: Amit Shah --- 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);