From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NSWka-0007Xv-Qz for qemu-devel@nongnu.org; Wed, 06 Jan 2010 09:20:40 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NSWkW-0007Tt-5A for qemu-devel@nongnu.org; Wed, 06 Jan 2010 09:20:40 -0500 Received: from [199.232.76.173] (port=48708 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSWkV-0007Tg-S4 for qemu-devel@nongnu.org; Wed, 06 Jan 2010 09:20:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58250) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NSWkV-0002Hk-4f for qemu-devel@nongnu.org; Wed, 06 Jan 2010 09:20:35 -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 o06EKYmO003691 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 6 Jan 2010 09:20:34 -0500 From: Gerd Hoffmann Date: Wed, 6 Jan 2010 15:20:30 +0100 Message-Id: <1262787630-27452-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [FOR 0.12 RESEND PATCH] pc: add machine type for 0.12 List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Oops. That one somehow missed the boat ... 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..8d66721 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 = (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", @@ -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); } -- 1.6.5.2