From patchwork Mon Feb 6 21:29:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 139813 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 6441E1007D1 for ; Tue, 7 Feb 2012 09:10:11 +1100 (EST) Received: from localhost ([::1]:60454 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RuWlE-0003P8-PB for incoming@patchwork.ozlabs.org; Mon, 06 Feb 2012 17:10:08 -0500 Received: from eggs.gnu.org ([140.186.70.92]:44813) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RuW8a-0004Xl-VA for qemu-devel@nongnu.org; Mon, 06 Feb 2012 16:30:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RuW8U-0001Pn-4r for qemu-devel@nongnu.org; Mon, 06 Feb 2012 16:30:12 -0500 Received: from smtp1-g21.free.fr ([212.27.42.1]:34271) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RuW8T-0001Mc-Eu for qemu-devel@nongnu.org; Mon, 06 Feb 2012 16:30:06 -0500 Received: from localhost.localdomain (unknown [82.227.227.196]) by smtp1-g21.free.fr (Postfix) with ESMTP id 81762940120; Mon, 6 Feb 2012 22:29:59 +0100 (CET) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Mon, 6 Feb 2012 22:29:08 +0100 Message-Id: <1328563752-3976-8-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 1.7.8.3 In-Reply-To: <1328563752-3976-1-git-send-email-hpoussin@reactos.org> References: <1328563752-3976-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 212.27.42.1 Cc: Kevin Wolf , =?UTF-8?q?Herv=C3=A9=20Poussineau?= Subject: [Qemu-devel] [PATCH v4 07/11] pc: add 1.1 machine type 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: Hervé Poussineau --- hw/pc_piix.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/hw/pc_piix.c b/hw/pc_piix.c index c06f1b5..400c6b6 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -371,9 +371,17 @@ static void pc_xen_hvm_init(ram_addr_t ram_size, } #endif +static QEMUMachine pc_machine_v1_1 = { + .name = "pc-1.1", + .alias = "pc", + .desc = "Standard PC", + .init = pc_init_pci, + .max_cpus = 255, + .is_default = 1, +}; + static QEMUMachine pc_machine_v1_0 = { .name = "pc-1.0", - .alias = "pc", .desc = "Standard PC", .init = pc_init_pci, .max_cpus = 255, @@ -670,6 +678,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);