diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2014-11-14 11:11:44 +0000 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2014-11-14 11:11:44 +0000 |
| commit | 91ab2ed7221c70ed7fd09ab2665b1f0493c775a4 (patch) | |
| tree | a34f32423940ef2cb10291c3951fd14ae3f44db4 /hw/acpi/piix4.c | |
| parent | c52e67924fbdadfa00668248f5c075542943c54c (diff) | |
| download | focaccia-qemu-91ab2ed7221c70ed7fd09ab2665b1f0493c775a4.tar.gz focaccia-qemu-91ab2ed7221c70ed7fd09ab2665b1f0493c775a4.zip | |
pc: piix4_pm: init legacy PCI hotplug when running on Xen
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. From: Igor Mammedov <imammedo@redhat.com> 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 <imammedo@redhat.com> Signed-off-by: Li Liang <liang.z.li@intel.com> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/acpi/piix4.c')
| -rw-r--r-- | hw/acpi/piix4.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 78c0a6d323..481a16c60a 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -36,6 +36,7 @@ #include "hw/mem/pc-dimm.h" #include "hw/acpi/memory_hotplug.h" #include "hw/acpi/acpi_dev_interface.h" +#include "hw/xen/xen.h" //#define DEBUG @@ -501,6 +502,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 (xen_enabled()) { + s->use_acpi_pci_hotplug = false; + } qdev_init_nofail(dev); |