From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:40699)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1XlemP-0005U2-0v
	for qemu-devel@nongnu.org; Tue, 04 Nov 2014 09:08:23 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1XlemI-0002LU-SP
	for qemu-devel@nongnu.org; Tue, 04 Nov 2014 09:08:16 -0500
Received: from mx1.redhat.com ([209.132.183.28]:50231)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1XlemI-0002LK-L6
	for qemu-devel@nongnu.org; Tue, 04 Nov 2014 09:08:10 -0500
Message-ID: <5458DDB5.5030807@redhat.com>
Date: Tue, 04 Nov 2014 15:07:49 +0100
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <1400846632-28506-1-git-send-email-imammedo@redhat.com>
	<E959C4978C3B6342920538CF579893F00224823F@SHSMSX104.ccr.corp.intel.com>
	<alpine.DEB.2.02.1411041023540.22875@kaball.uk.xensource.com>
In-Reply-To: <alpine.DEB.2.02.1411041023540.22875@kaball.uk.xensource.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] pc: piix4_pm: init legacy PCI hotplug when
 running on Xen
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: Stefano Stabellini <stefano.stabellini@eu.citrix.com>, "Wu, Feng" <feng.wu@intel.com>
Cc: "mst@redhat.com" <mst@redhat.com>, "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>, "aliguori@amazon.com" <aliguori@amazon.com>, "Chen,
	Tiejun" <tiejun.chen@intel.com>, "anthony.perard@citrix.com" <anthony.perard@citrix.com>, Igor Mammedov <imammedo@redhat.com>

On 04/11/2014 11:36, Stefano Stabellini wrote:
> Feng, thanks for the email.
> 
> I was assuming that one of the other maintainers would take care of the
> patch, but I am happy to submit a pull request for it too.
> 
> Paolo, Michael?

I think this patch is not okay, because Xen does use fw_cfg when you
have -kernel.  So I think you should really use "if (xen_enabled())".

Paolo

>>> diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
>>> index 227ea30..12542c3 100644
>>> --- a/hw/acpi/piix4.c
>>> +++ b/hw/acpi/piix4.c
>>> @@ -501,6 +501,9 @@ I2CBus *piix4_pm_init(PCIBus *bus, int devfn,
>>> uint32_t smb_io_base,
>>>      s->irq = sci_irq;
>>>      s->smi_irq = smi_irq;
>>>      s->kvm_enabled = kvm_enabled;
>>> +    if (!fw_cfg) {
>>> +        s->use_acpi_pci_hotplug = false;
>>> +    }
>>>
>>>      qdev_init_nofail(dev);
>>>
>>> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
>>> index a13e8d6..067ff0c 100644
>>> --- a/hw/i386/pc_piix.c
>>> +++ b/hw/i386/pc_piix.c
>>> @@ -840,17 +840,6 @@ static QEMUMachine xenfv_machine = {
>>>      .max_cpus = HVM_MAX_VCPUS,
>>>      .default_machine_opts = "accel=xen",
>>>      .hot_add_cpu = pc_hot_add_cpu,
>>> -    .compat_props = (GlobalProperty[]) {
>>> -        /* xenfv has no fwcfg and so does not load acpi from QEMU.
>>> -         * as such new acpi features don't work.
>>> -         */
>>> -        {
>>> -            .driver   = "PIIX4_PM",
>>> -            .property = "acpi-pci-hotplug-with-bridge-support",
>>> -            .value    = "off",
>>> -        },
>>> -        { /* end of list */ }
>>> -    },
>>>  };
>>>  #endif
>>>
>>> --
>>> 1.9.0
>>>
>>