From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NUQHa-0005u1-48
	for qemu-devel@nongnu.org; Mon, 11 Jan 2010 14:50:34 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NUQHV-0005s9-Fu
	for qemu-devel@nongnu.org; Mon, 11 Jan 2010 14:50:33 -0500
Received: from [199.232.76.173] (port=34010 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NUQHV-0005s6-3I
	for qemu-devel@nongnu.org; Mon, 11 Jan 2010 14:50:29 -0500
Received: from qw-out-1920.google.com ([74.125.92.148]:52215)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <anthony@codemonkey.ws>) id 1NUQHU-00037k-N0
	for qemu-devel@nongnu.org; Mon, 11 Jan 2010 14:50:28 -0500
Received: by qw-out-1920.google.com with SMTP id 5so3770142qwc.4
	for <qemu-devel@nongnu.org>; Mon, 11 Jan 2010 11:50:28 -0800 (PST)
Message-ID: <4B4B8101.30302@codemonkey.ws>
Date: Mon, 11 Jan 2010 13:50:25 -0600
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH 1/6] pc: add machine type for 0.12
References: <1262960742-18267-1-git-send-email-kraxel@redhat.com>
	<1262960742-18267-2-git-send-email-kraxel@redhat.com>
In-Reply-To: <1262960742-18267-2-git-send-email-kraxel@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://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

On 01/08/2010 08:25 AM, Gerd Hoffmann wrote:
> Add a new machine type for qemu 0.12.
>
> Also fixup the 0.11 machine type: msi for virtio-blk-pci was enabled
> after the 0.11 release, so turn it off in the 0.11 machine type.
>
> Signed-off-by: Gerd Hoffmann<kraxel@redhat.com>
>    

Applied all.  Thanks.

Regards,

Anthony Liguori
> ---
>   hw/pc.c |   18 +++++++++++++++++-
>   1 files changed, 17 insertions(+), 1 deletions(-)
>
> diff --git a/hw/pc.c b/hw/pc.c
> index 83f8dd0..ea5ac8e 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -1298,7 +1298,7 @@ void cmos_set_s3_resume(void)
>   }
>
>   static QEMUMachine pc_machine = {
> -    .name = "pc-0.11",
> +    .name = "pc-0.12",
>       .alias = "pc",
>       .desc = "Standard PC",
>       .init = pc_init_pci,
> @@ -1306,6 +1306,21 @@ static QEMUMachine pc_machine = {
>       .is_default = 1,
>   };
>
> +static QEMUMachine pc_machine_v0_11 = {
> +    .name = "pc-0.11",
> +    .desc = "Standard PC, qemu 0.11",
> +    .init = pc_init_pci,
> +    .max_cpus = 255,
> +    .compat_props = (GlobalProperty[]) {
> +        {
> +            .driver   = "virtio-blk-pci",
> +            .property = "vectors",
> +            .value    = stringify(0),
> +        },
> +        { /* end of list */ }
> +    }
> +};
> +
>   static QEMUMachine pc_machine_v0_10 = {
>       .name = "pc-0.10",
>       .desc = "Standard PC, qemu 0.10",
> @@ -1343,6 +1358,7 @@ static QEMUMachine isapc_machine = {
>   static void pc_machine_init(void)
>   {
>       qemu_register_machine(&pc_machine);
> +    qemu_register_machine(&pc_machine_v0_11);
>       qemu_register_machine(&pc_machine_v0_10);
>       qemu_register_machine(&isapc_machine);
>   }
>