From patchwork Mon Feb 15 15:13:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 45394 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 322F5B7B98 for ; Tue, 16 Feb 2010 02:58:06 +1100 (EST) Received: from localhost ([127.0.0.1]:58330 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nh3Gp-000807-Lw for incoming@patchwork.ozlabs.org; Mon, 15 Feb 2010 10:53:59 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nh3E9-0007Wt-Si for qemu-devel@nongnu.org; Mon, 15 Feb 2010 10:51:13 -0500 Received: from [199.232.76.173] (port=35959 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nh3E9-0007Wf-Ex for qemu-devel@nongnu.org; Mon, 15 Feb 2010 10:51:13 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nh3E8-0002H0-AB for qemu-devel@nongnu.org; Mon, 15 Feb 2010 10:51:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49298) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nh2fK-0007zO-IP for qemu-devel@nongnu.org; Mon, 15 Feb 2010 10:15:15 -0500 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o1FFF69C014061 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 15 Feb 2010 10:15:06 -0500 Received: from localhost (vpn-234-46.phx2.redhat.com [10.3.234.46]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o1FFF4xQ015878; Mon, 15 Feb 2010 10:15:05 -0500 From: Amit Shah To: qemu-devel@nongnu.org Date: Mon, 15 Feb 2010 20:43:54 +0530 Message-Id: <1266246836-19932-1-git-send-email-amit.shah@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Amit Shah , kraxel@redhat.com Subject: [Qemu-devel] [PATCH v2 1/3] pc: Bump up pc version to 0.13 and add a 0.12 compat version 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 The version 0.13 will be the new default and compatibility options will be added to the 0.12 version. Signed-off-by: Amit Shah --- v2: register the 0.12 version in this patch instead of the next one. hw/pc.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 6fbe98b..c27ad0f 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1052,7 +1052,7 @@ void cmos_set_s3_resume(void) } static QEMUMachine pc_machine = { - .name = "pc-0.12", + .name = "pc-0.13", .alias = "pc", .desc = "Standard PC", .init = pc_init_pci, @@ -1060,6 +1060,13 @@ static QEMUMachine pc_machine = { .is_default = 1, }; +static QEMUMachine pc_machine_v0_12 = { + .name = "pc-0.12", + .desc = "Standard PC", + .init = pc_init_pci, + .max_cpus = 255, +}; + static QEMUMachine pc_machine_v0_11 = { .name = "pc-0.11", .desc = "Standard PC, qemu 0.11", @@ -1136,6 +1143,7 @@ static QEMUMachine isapc_machine = { static void pc_machine_init(void) { qemu_register_machine(&pc_machine); + qemu_register_machine(&pc_machine_v0_12); qemu_register_machine(&pc_machine_v0_11); qemu_register_machine(&pc_machine_v0_10); qemu_register_machine(&isapc_machine);