summaryrefslogtreecommitdiffstats
path: root/hw/pc_piix.c
diff options
context:
space:
mode:
authorStefano Stabellini2011-07-18 08:07:02 +0200
committerAlexander Graf2011-07-26 07:02:17 +0200
commit679f4f8b178e7c66fbc2f39c905374ee8663d5d8 (patch)
treea7d65c3fd79b4c6c75f23736e8c1ac640feecd8d /hw/pc_piix.c
parentvl.c: Check the asked ram_size later. (diff)
downloadqemu-679f4f8b178e7c66fbc2f39c905374ee8663d5d8.tar.gz
qemu-679f4f8b178e7c66fbc2f39c905374ee8663d5d8.tar.xz
qemu-679f4f8b178e7c66fbc2f39c905374ee8663d5d8.zip
xen: implement unplug protocol in xen_platform
The unplug protocol is necessary to support PV drivers in the guest: the drivers expect to be able to "unplug" emulated disks and nics before initializing the Xen PV interfaces. It is responsibility of the guest to make sure that the unplug is done before the emulated devices or the PV interface start to be used. We use pci_for_each_device to walk the PCI bus, identify the devices and disks that we want to disable and dynamically unplug them. Changes in v2: - use PCI_CLASS constants; - replace pci_unplug_device with qdev_unplug; - do not import hw/ide/internal.h in xen_platform.c; Changes in v3: - introduce piix3-ide-xen, that support hot-unplug; - move the unplug code to hw/ide/piix.c; - just call qdev_unplug from xen_platform.c to unplug the IDE disks; Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Acked-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw/pc_piix.c')
-rw-r--r--hw/pc_piix.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index c5c16b4571..40b73ea25c 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -155,7 +155,11 @@ static void pc_init1(ram_addr_t ram_size,
ide_drive_get(hd, MAX_IDE_BUS);
if (pci_enabled) {
PCIDevice *dev;
- dev = pci_piix3_ide_init(pci_bus, hd, piix3_devfn + 1);
+ if (xen_enabled()) {
+ dev = pci_piix3_xen_ide_init(pci_bus, hd, piix3_devfn + 1);
+ } else {
+ dev = pci_piix3_ide_init(pci_bus, hd, piix3_devfn + 1);
+ }
idebus[0] = qdev_get_child_bus(&dev->qdev, "ide.0");
idebus[1] = qdev_get_child_bus(&dev->qdev, "ide.1");
} else {