From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RNRCF-00067Q-8a for qemu-devel@nongnu.org; Mon, 07 Nov 2011 10:33:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RNRCE-0007mO-2P for qemu-devel@nongnu.org; Mon, 07 Nov 2011 10:33:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:6738) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RNRCD-0007lt-QZ for qemu-devel@nongnu.org; Mon, 07 Nov 2011 10:33:14 -0500 From: Gerd Hoffmann Date: Mon, 7 Nov 2011 16:33:08 +0100 Message-Id: <1320679989-8274-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] pc: add 1.0 machine type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , kvm@vger.kernel.org This patch adds a pc-1.0 machine type. Signed-off-by: Gerd Hoffmann --- hw/pc_piix.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 8c7f2b7..93e40d0 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -297,8 +297,8 @@ static void pc_xen_hvm_init(ram_addr_t ram_size, } #endif -static QEMUMachine pc_machine = { - .name = "pc-0.14", +static QEMUMachine pc_machine_v1_0 = { + .name = "pc-1.0", .alias = "pc", .desc = "Standard PC", .init = pc_init_pci, @@ -306,6 +306,13 @@ static QEMUMachine pc_machine = { .is_default = 1, }; +static QEMUMachine pc_machine_v0_14 = { + .name = "pc-0.14", + .desc = "Standard PC", + .init = pc_init_pci, + .max_cpus = 255, +}; + static QEMUMachine pc_machine_v0_13 = { .name = "pc-0.13", .desc = "Standard PC", @@ -521,7 +528,8 @@ static QEMUMachine xenfv_machine = { static void pc_machine_init(void) { - qemu_register_machine(&pc_machine); + qemu_register_machine(&pc_machine_v1_0); + qemu_register_machine(&pc_machine_v0_14); qemu_register_machine(&pc_machine_v0_13); qemu_register_machine(&pc_machine_v0_12); qemu_register_machine(&pc_machine_v0_11); -- 1.7.1