From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:54913)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1RNpSZ-0005gZ-EP
	for qemu-devel@nongnu.org; Tue, 08 Nov 2011 12:27:44 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1RNpSY-0000yJ-Ht
	for qemu-devel@nongnu.org; Tue, 08 Nov 2011 12:27:43 -0500
Received: from mail-yw0-f45.google.com ([209.85.213.45]:33200)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1RNpSY-0000yF-DQ
	for qemu-devel@nongnu.org; Tue, 08 Nov 2011 12:27:42 -0500
Received: by ywb3 with SMTP id 3so868615ywb.4
	for <qemu-devel@nongnu.org>; Tue, 08 Nov 2011 09:27:42 -0800 (PST)
Message-ID: <4EB965EE.2010104@codemonkey.ws>
Date: Tue, 08 Nov 2011 11:25:02 -0600
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
References: <1320679989-8274-1-git-send-email-kraxel@redhat.com>
In-Reply-To: <1320679989-8274-1-git-send-email-kraxel@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 1/2] pc: add 1.0 machine type
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: qemu-devel@nongnu.org, 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);