From patchwork Sun Jan 8 19:51:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jordan.l.justen@intel.com X-Patchwork-Id: 134928 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 737F7B6F68 for ; Mon, 9 Jan 2012 06:53:41 +1100 (EST) Received: from localhost ([::1]:57210 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rjyo5-0006Ce-FB for incoming@patchwork.ozlabs.org; Sun, 08 Jan 2012 14:53:29 -0500 Received: from eggs.gnu.org ([140.186.70.92]:35597) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rjynl-0005yk-MC for qemu-devel@nongnu.org; Sun, 08 Jan 2012 14:53:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rjynk-0004p7-4A for qemu-devel@nongnu.org; Sun, 08 Jan 2012 14:53:09 -0500 Received: from mga02.intel.com ([134.134.136.20]:43876) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rjynj-0004mK-Vs for qemu-devel@nongnu.org; Sun, 08 Jan 2012 14:53:08 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 08 Jan 2012 11:53:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.67,352,1309762800"; d="scan'208";a="94194010" Received: from unknown (HELO jljusten-laptop.amr.corp.intel.com) ([10.255.13.217]) by orsmga001.jf.intel.com with ESMTP; 08 Jan 2012 11:53:07 -0800 From: Jordan Justen To: qemu-devel@nongnu.org Date: Sun, 8 Jan 2012 11:51:39 -0800 Message-Id: <1326052300-1172-8-git-send-email-jordan.l.justen@intel.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1326052300-1172-1-git-send-email-jordan.l.justen@intel.com> References: <1326052300-1172-1-git-send-email-jordan.l.justen@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.20 Cc: Jordan Justen Subject: [Qemu-devel] [PATCH v10 7/8] hw/pc_piix: add pc-1.1 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 Signed-off-by: Jordan Justen --- hw/pc_piix.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 00f525e..aea95e4 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -314,8 +314,8 @@ static void pc_xen_hvm_init(ram_addr_t ram_size, } #endif -static QEMUMachine pc_machine_v1_0 = { - .name = "pc-1.0", +static QEMUMachine pc_machine_v1_1 = { + .name = "pc-1.1", .alias = "pc", .desc = "Standard PC", .init = pc_init_pci, @@ -323,6 +323,13 @@ static QEMUMachine pc_machine_v1_0 = { .is_default = 1, }; +static QEMUMachine pc_machine_v1_0 = { + .name = "pc-1.0", + .desc = "Standard PC", + .init = pc_init_pci, + .max_cpus = 255, +}; + static QEMUMachine pc_machine_v0_15 = { .name = "pc-0.15", .desc = "Standard PC",