From mboxrd@z Thu Jan  1 00:00:00 1970
From: Anthony Liguori <anthony@codemonkey.ws>
Subject: Re: [Qemu-devel] [PATCH 1/2] pc: add 1.0 machine type
Date: Tue, 08 Nov 2011 11:25:02 -0600
Message-ID: <4EB965EE.2010104@codemonkey.ws>
References: <1320679989-8274-1-git-send-email-kraxel@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org
To: Gerd Hoffmann <kraxel@redhat.com>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mail-gx0-f174.google.com ([209.85.161.174]:39670 "EHLO
	mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751247Ab1KHR1l (ORCPT <rfc822;kvm@vger.kernel.org>);
	Tue, 8 Nov 2011 12:27:41 -0500
Received: by ggnb2 with SMTP id b2so784088ggn.19
        for <kvm@vger.kernel.org>; Tue, 08 Nov 2011 09:27:40 -0800 (PST)
In-Reply-To: <1320679989-8274-1-git-send-email-kraxel@redhat.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

On 11/07/2011 09:33 AM, Gerd Hoffmann wrote:
> This patch adds a pc-1.0 machine type.
>
> Signed-off-by: Gerd Hoffmann<kraxel@redhat.com>

Applied both.  Thanks.

Regards,

Anthony Liguori

> ---
>   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);