From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54584) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnoCl-0002EX-Kh for qemu-devel@nongnu.org; Fri, 23 May 2014 08:04:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WnoCf-0006un-AW for qemu-devel@nongnu.org; Fri, 23 May 2014 08:04:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13408) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnoCf-0006ua-2H for qemu-devel@nongnu.org; Fri, 23 May 2014 08:04:01 -0400 From: Igor Mammedov Date: Fri, 23 May 2014 14:03:52 +0200 Message-Id: <1400846632-28506-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH] pc: piix4_pm: init legacy PCI hotplug when running on Xen List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: anthony.perard@citrix.com, tiejun.chen@intel.com, stefano.stabellini@eu.citrix.com, aliguori@amazon.com, mst@redhat.com if user starts QEMU with "-machine pc,accel=xen", then compat property in xenfv won't work and it would cause error: "Unsupported bus. Bus doesn't have property 'acpi-pcihp-bsel' set" when PCI device is added with -device on QEMU CLI. In case of Xen instead of using compat property, just use the fact that xen doesn't use QEMU's fw_cfg/acpi tables to switch piix4_pm into legacy PCI hotplug mode when Xen is enabled. Signed-off-by: Igor Mammedov --- hw/acpi/piix4.c | 3 +++ hw/i386/pc_piix.c | 11 ----------- 2 files changed, 3 insertions(+), 11 deletions(-) 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