From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=36682 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PVIA4-0004Ps-OO
	for qemu-devel@nongnu.org; Wed, 22 Dec 2010 01:26:57 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1PVIA3-0004Uo-D1
	for qemu-devel@nongnu.org; Wed, 22 Dec 2010 01:26:56 -0500
Received: from mx1.redhat.com ([209.132.183.28]:63286)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1PVIA3-0004Ui-6O
	for qemu-devel@nongnu.org; Wed, 22 Dec 2010 01:26:55 -0500
Date: Wed, 22 Dec 2010 08:26:33 +0200
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20101222062633.GB7814@redhat.com>
References: <09a87b44fa9570bc896790ec2a9014f8c21f6601.1292998370.git.yamahata@valinux.co.jp>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <09a87b44fa9570bc896790ec2a9014f8c21f6601.1292998370.git.yamahata@valinux.co.jp>
Subject: [Qemu-devel] Re: [PATCH] pc/piix: fix mismerge of
 b1aeb92666d2fde413c34578b3b42bbfe5f2a506
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.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: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Isaku Yamahata <yamahata@valinux.co.jp>
Cc: qemu-devel@nongnu.org

On Wed, Dec 22, 2010 at 03:13:43PM +0900, Isaku Yamahata wrote:
> The change set of b1aeb92666d2fde413c34578b3b42bbfe5f2a506 in pci branch
> was mismerged. The compatibility should be kept for 0.13, not for 0.14.
> 
> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>


Applied.

> ---
>  hw/pc_piix.c |   12 ++++--------
>  1 files changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/hw/pc_piix.c b/hw/pc_piix.c
> index a2fb554..f82508d 100644
> --- a/hw/pc_piix.c
> +++ b/hw/pc_piix.c
> @@ -217,14 +217,6 @@ static QEMUMachine pc_machine = {
>      .desc = "Standard PC",
>      .init = pc_init_pci,
>      .max_cpus = 255,
> -    .compat_props = (GlobalProperty[]) {
> -        {
> -            .driver   = "PCI",
> -            .property = "command_serr_enable",
> -            .value    = "off",
> -        },
> -        { /* end of list */ }
> -    },
>      .is_default = 1,
>  };
>  
> @@ -246,6 +238,10 @@ static QEMUMachine pc_machine_v0_13 = {
>              .driver   = "vmware-svga",
>              .property = "rombar",
>              .value    = stringify(0),
> +        },{
> +            .driver   = "PCI",
> +            .property = "command_serr_enable",
> +            .value    = "off",
>          },
>          { /* end of list */ }
>      },
> -- 
> 1.7.1.1