From patchwork Fri Jan 8 14:25:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 42506 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 7A040B7C08 for ; Sat, 9 Jan 2010 01:31:57 +1100 (EST) Received: from localhost ([127.0.0.1]:52529 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTFsY-0006Sz-Da for incoming@patchwork.ozlabs.org; Fri, 08 Jan 2010 09:31:54 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NTFml-0003H8-BW for qemu-devel@nongnu.org; Fri, 08 Jan 2010 09:25:55 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NTFmf-0003Ck-It for qemu-devel@nongnu.org; Fri, 08 Jan 2010 09:25:54 -0500 Received: from [199.232.76.173] (port=43422 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTFmf-0003C7-1B for qemu-devel@nongnu.org; Fri, 08 Jan 2010 09:25:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:30216) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NTFme-0006J2-EI for qemu-devel@nongnu.org; Fri, 08 Jan 2010 09:25:48 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o08EPkC5030152 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 8 Jan 2010 09:25:47 -0500 Received: from zweiblum.home.kraxel.org (vpn2-11-198.ams2.redhat.com [10.36.11.198]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o08EPiKU016872; Fri, 8 Jan 2010 09:25:45 -0500 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 6D3B570FCD; Fri, 8 Jan 2010 15:25:42 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 8 Jan 2010 15:25:37 +0100 Message-Id: <1262960742-18267-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1262960742-18267-1-git-send-email-kraxel@redhat.com> References: <1262960742-18267-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 1/6] pc: add machine type for 0.12 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 new machine type for qemu 0.12. Also fixup the 0.11 machine type: msi for virtio-blk-pci was enabled after the 0.11 release, so turn it off in the 0.11 machine type. Signed-off-by: Gerd Hoffmann --- hw/pc.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 83f8dd0..ea5ac8e 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1298,7 +1298,7 @@ void cmos_set_s3_resume(void) } static QEMUMachine pc_machine = { - .name = "pc-0.11", + .name = "pc-0.12", .alias = "pc", .desc = "Standard PC", .init = pc_init_pci, @@ -1306,6 +1306,21 @@ static QEMUMachine pc_machine = { .is_default = 1, }; +static QEMUMachine pc_machine_v0_11 = { + .name = "pc-0.11", + .desc = "Standard PC, qemu 0.11", + .init = pc_init_pci, + .max_cpus = 255, + .compat_props = (GlobalProperty[]) { + { + .driver = "virtio-blk-pci", + .property = "vectors", + .value = stringify(0), + }, + { /* end of list */ } + } +}; + static QEMUMachine pc_machine_v0_10 = { .name = "pc-0.10", .desc = "Standard PC, qemu 0.10", @@ -1343,6 +1358,7 @@ static QEMUMachine isapc_machine = { static void pc_machine_init(void) { qemu_register_machine(&pc_machine); + qemu_register_machine(&pc_machine_v0_11); qemu_register_machine(&pc_machine_v0_10); qemu_register_machine(&isapc_machine); }