From patchwork Fri Jun 22 09:25:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 166546 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A6CB0B6FAA for ; Fri, 22 Jun 2012 19:25:40 +1000 (EST) Received: from localhost ([::1]:45626 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Si07W-0006pM-2E for incoming@patchwork.ozlabs.org; Fri, 22 Jun 2012 05:25:38 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38127) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Si07M-0006pE-DP for qemu-devel@nongnu.org; Fri, 22 Jun 2012 05:25:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Si07I-00072K-GA for qemu-devel@nongnu.org; Fri, 22 Jun 2012 05:25:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2221) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Si07I-000719-8O for qemu-devel@nongnu.org; Fri, 22 Jun 2012 05:25:24 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q5M9PMow028069 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 22 Jun 2012 05:25:22 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q5M9PLux023041; Fri, 22 Jun 2012 05:25:22 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 3DEB140D7E; Fri, 22 Jun 2012 11:25:20 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 22 Jun 2012 11:25:17 +0200 Message-Id: <1340357118-17562-10-git-send-email-kraxel@redhat.com> In-Reply-To: <1340357118-17562-1-git-send-email-kraxel@redhat.com> References: <1340357118-17562-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 09/10] add pc-1.2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org --- hw/pc_piix.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/hw/pc_piix.c b/hw/pc_piix.c index eae258c..2ed9f1a 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -349,8 +349,8 @@ static void pc_xen_hvm_init(ram_addr_t ram_size, } #endif -static QEMUMachine pc_machine_v1_1 = { - .name = "pc-1.1", +static QEMUMachine pc_machine_v1_2 = { + .name = "pc-1.2", .alias = "pc", .desc = "Standard PC", .init = pc_init_pci, @@ -358,6 +358,13 @@ static QEMUMachine pc_machine_v1_1 = { .is_default = 1, }; +static QEMUMachine pc_machine_v1_1 = { + .name = "pc-1.1", + .desc = "Standard PC", + .init = pc_init_pci, + .max_cpus = 255, +}; + #define PC_COMPAT_1_0 \ {\ .driver = "pc-sysfw",\ @@ -612,6 +619,7 @@ static QEMUMachine xenfv_machine = { static void pc_machine_init(void) { + qemu_register_machine(&pc_machine_v1_2); qemu_register_machine(&pc_machine_v1_1); qemu_register_machine(&pc_machine_v1_0); qemu_register_machine(&pc_machine_v0_15);