From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Jordan Justen Date: Sun, 8 Jan 2012 11:51:39 -0800 Message-Id: <1326052300-1172-8-git-send-email-jordan.l.justen@intel.com> 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> Subject: [Qemu-devel] [PATCH v10 7/8] hw/pc_piix: add pc-1.1 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jordan Justen 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", -- 1.7.1