From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:49493) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S06UJ-00073Q-Pl for qemu-devel@nongnu.org; Wed, 22 Feb 2012 02:19:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S06UD-0007rp-IQ for qemu-devel@nongnu.org; Wed, 22 Feb 2012 02:19:43 -0500 Received: from mga14.intel.com ([143.182.124.37]:51996) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S06UD-0007n5-BH for qemu-devel@nongnu.org; Wed, 22 Feb 2012 02:19:37 -0500 From: Jordan Justen Date: Tue, 21 Feb 2012 23:18:55 -0800 Message-Id: <1329895136-20494-9-git-send-email-jordan.l.justen@intel.com> In-Reply-To: <1329895136-20494-1-git-send-email-jordan.l.justen@intel.com> References: <1329895136-20494-1-git-send-email-jordan.l.justen@intel.com> Subject: [Qemu-devel] [PATCH v11 8/9] 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 | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 2fc4211..fcf0153 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -371,8 +371,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, @@ -380,6 +380,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", @@ -669,6 +676,7 @@ static QEMUMachine xenfv_machine = { static void pc_machine_init(void) { + qemu_register_machine(&pc_machine_v1_1); qemu_register_machine(&pc_machine_v1_0); qemu_register_machine(&pc_machine_v0_15); qemu_register_machine(&pc_machine_v0_14); -- 1.7.1