From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:35730)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <imammedo@redhat.com>) id 1W5I8v-000660-K3
	for qemu-devel@nongnu.org; Mon, 20 Jan 2014 11:56:15 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <imammedo@redhat.com>) id 1W5I8o-0006Cp-Of
	for qemu-devel@nongnu.org; Mon, 20 Jan 2014 11:56:09 -0500
Received: from mx1.redhat.com ([209.132.183.28]:5045)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <imammedo@redhat.com>) id 1W5I8o-0006Cj-ET
	for qemu-devel@nongnu.org; Mon, 20 Jan 2014 11:56:02 -0500
Date: Mon, 20 Jan 2014 17:55:56 +0100
From: Igor Mammedov <imammedo@redhat.com>
Message-ID: <20140120175556.254f60fe@nial.usersys.redhat.com>
In-Reply-To: <20140120163517.GA13407@redhat.com>
References: <20140120163517.GA13407@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] piix4: disable bridge acpi hotplug for 1.7
	and older
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: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>, Eduardo Habkost <ehabkost@redhat.com>, qemu-devel@nongnu.org, Anthony Liguori <aliguori@amazon.com>, Andreas =?ISO-8859-1?B?RuRyYmVy?= <afaerber@suse.de>

On Mon, 20 Jan 2014 18:35:17 +0200
"Michael S. Tsirkin" <mst@redhat.com> wrote:

> Patch was written before 1.7 was out, forgot to update.
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> 
> I moved for_anthony tag to include this patch
> as well, no reason to make people suffer until
> next pull request.
Reviewed-By: Igor Mammedov <imammedo@redhat.com>

> 
>  hw/i386/pc_piix.c    |  4 ++++
>  include/hw/i386/pc.h | 13 ++++++++-----
>  2 files changed, 12 insertions(+), 5 deletions(-)
> 
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 2766414..a327d71 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -393,6 +393,10 @@ static QEMUMachine pc_i440fx_machine_v1_7 = {
>      PC_I440FX_1_7_MACHINE_OPTIONS,
>      .name = "pc-i440fx-1.7",
>      .init = pc_init_pci_1_7,
> +    .compat_props = (GlobalProperty[]) {
> +        PC_COMPAT_1_7,
> +        { /* end of list */ }
> +    },
>  };
>  
>  #define PC_I440FX_1_6_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 71653e8..fd9f369 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -240,7 +240,15 @@ uint16_t pvpanic_port(void);
>  
>  int e820_add_entry(uint64_t, uint64_t, uint32_t);
>  
> +#define PC_COMPAT_1_7 \
> +        {\
> +            .driver   = "PIIX4_PM",\
> +            .property = "acpi-pci-hotplug-with-bridge-support",\
> +            .value    = "off",\
> +        }
> +
>  #define PC_Q35_COMPAT_1_7 \
> +        PC_COMPAT_1_7, \
>          {\
>              .driver   = "hpet",\
>              .property = HPET_INTCAP,\
> @@ -261,11 +269,6 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);
>  
>  #define PC_COMPAT_1_6 \
>          {\
> -            .driver   = "PIIX4_PM",\
> -            .property = "acpi-pci-hotplug-with-bridge-support",\
> -            .value    = "off",\
> -        }, \
> -        {\
>              .driver   = "e1000",\
>              .property = "mitigation",\
>              .value    = "off",\