From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:44942)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <balaton@jedlik.phy.bme.hu>) id 1WzXnk-0000Ks-4g
	for qemu-devel@nongnu.org; Tue, 24 Jun 2014 16:58:55 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <balaton@jedlik.phy.bme.hu>) id 1WzXnc-0004xp-Fl
	for qemu-devel@nongnu.org; Tue, 24 Jun 2014 16:58:48 -0400
Received: from jedlik.phy.bme.hu ([152.66.102.83]:47279)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <balaton@jedlik.phy.bme.hu>) id 1WzXnc-0004wS-9R
	for qemu-devel@nongnu.org; Tue, 24 Jun 2014 16:58:40 -0400
Date: Tue, 24 Jun 2014 22:58:29 +0200 (CEST)
From: BALATON Zoltan <balaton@eik.bme.hu>
In-Reply-To: <1403632924-16603-4-git-send-email-ehabkost@redhat.com>
Message-ID: <alpine.LMD.2.02.1406242254010.2822@jedlik.phy.bme.hu>
References: <1403632924-16603-1-git-send-email-ehabkost@redhat.com>
	<1403632924-16603-4-git-send-email-ehabkost@redhat.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Subject: Re: [Qemu-devel] [PATCH 3/4] machine: Introduce QEMU_COMPAT_* macros
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: Eduardo Habkost <ehabkost@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>, Marcel Apfelbaum <marcel.a@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, qemu-devel@nongnu.org, Anthony Liguori <aliguori@amazon.com>, Paolo Bonzini <pbonzini@redhat.com>

On Tue, 24 Jun 2014, Eduardo Habkost wrote:
> The QEMU_COMPAT_* macros will contain compat properties that are not
> specific to PC, and may be reused by other machine-types.
>
> PC-specific properties were left on the PC_COMPAT_* macros.
>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> include/hw/boards.h  | 161 +++++++++++++++++++++++++++++++++++++++++++++++++++
> include/hw/i386/pc.h | 150 ++---------------------------------------------
> 2 files changed, 166 insertions(+), 145 deletions(-)
>
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index 605a970..709b582 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -134,4 +134,165 @@ struct MachineState {
>     const char *cpu_model;
> };
>
> +
> +/* Macros for compat_props corresponding to specific QEMU versions: */
> +
> +#define QEMU_COMPAT_2_0 \
> +    {\
> +        .driver   = "virtio-scsi-pci",\
> +        .property = "any_layout",\
> +        .value    = "off",\
> +    },\
> +    {\
> +        .driver   = "apic",\
> +        .property = "version",\
> +        .value    = stringify(0x11),\
> +    },\
> +    {\
> +        .driver   = "nec-usb-xhci",\
> +        .property = "superspeed-ports-first",\
> +        .value    = "off",\
> +    },\
> +    {\
> +        .driver   = "pci-serial",\
> +        .property = "prog_if",\
> +        .value    = stringify(0),\
> +    },\
> +    {\
> +        .driver   = "pci-serial-2x",\
> +        .property = "prof_if",\

Just noticed a typo now in this part which was added by me previously. 
This should also be "prog_if" instead of "prof_if". Can you also correct 
that while changing this or otherwise while merging or should I send a 
separate patch with just this change?

Regards,
BALATON Zoltan

> +        .value    = stringify(0),\
> +    },\
> +    {\
> +        .driver   = "pci-serial-4x",\
> +        .property = "prog_if",\
> +        .value    = stringify(0),\
> +    },\
> +    {\
> +        .driver   = "virtio-net-pci",\
> +        .property = "guest_announce",\
> +        .value    = "off",\
> +    }
> +
> +#define QEMU_COMPAT_1_7 \