]> xenbits.xensource.com Git - qemu-upstream-4.5-testing.git/commit
pc: piix4_pm: init legacy PCI hotplug when running on Xen
authorIgor Mammedov <imammedo@redhat.com>
Fri, 14 Nov 2014 11:11:44 +0000 (11:11 +0000)
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>
Mon, 17 Nov 2014 11:19:34 +0000 (11:19 +0000)
commit0c94ca5ffeb6d314404ecbc231bef28fe8d3fc51
treeb773f5226adfedcd676b25351ed69a1ee1c6134b
parentabbbc2f09a53f8f9ee565356ab11a78af006e45e
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.

upstream-commit-id: 91ab2ed7221c70ed7fd09ab2665b1f0493c775a4

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>
Tested-by: Li Liang <liang.z.li@intel.com>
Conflicts:
hw/acpi/piix4.c
hw/acpi/piix4.c
hw/i386/pc_piix.c