From patchwork Wed Nov 25 08:16:47 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 39291 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 A61B51007D1 for ; Wed, 25 Nov 2009 19:18:24 +1100 (EST) Received: from localhost ([127.0.0.1]:55762 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDD4u-0004Cv-GG for incoming@patchwork.ozlabs.org; Wed, 25 Nov 2009 03:18:20 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NDD3d-0003nJ-OP for qemu-devel@nongnu.org; Wed, 25 Nov 2009 03:17:01 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NDD3Z-0003jx-37 for qemu-devel@nongnu.org; Wed, 25 Nov 2009 03:17:01 -0500 Received: from [199.232.76.173] (port=51975 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDD3Y-0003js-Rk for qemu-devel@nongnu.org; Wed, 25 Nov 2009 03:16:56 -0500 Received: from mx20.gnu.org ([199.232.41.8]:64823) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NDD3Y-00073b-5e for qemu-devel@nongnu.org; Wed, 25 Nov 2009 03:16:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NDD3X-0006QL-BI for qemu-devel@nongnu.org; Wed, 25 Nov 2009 03:16:55 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAP8GrxP032568 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 25 Nov 2009 03:16:53 -0500 Received: from zweiblum.home.kraxel.org (vpn1-4-184.ams2.redhat.com [10.36.4.184]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id nAP8GpKu022633; Wed, 25 Nov 2009 03:16:52 -0500 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 576FD700E5; Wed, 25 Nov 2009 09:16:49 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 25 Nov 2009 09:16:47 +0100 Message-Id: <1259137008-9669-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by mx20.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 1/2] 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 7c791c4..fdaa52c 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1279,7 +1279,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, @@ -1287,6 +1287,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 = (CompatProperty[]) { + { + .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", @@ -1324,6 +1339,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); }