diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-07-29 09:42:12 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-07-29 09:42:12 -0500 |
| commit | 3046c984049070ab5843da1753ce3a22e25b52cd (patch) | |
| tree | eb706dd61603bbce9d669fb2f35bd06688cdf396 /hw/pc_piix.c | |
| parent | e374560232776d4141866abc9f520c132b394926 (diff) | |
| parent | 679f4f8b178e7c66fbc2f39c905374ee8663d5d8 (diff) | |
| download | qemu-3046c984049070ab5843da1753ce3a22e25b52cd.tar.gz qemu-3046c984049070ab5843da1753ce3a22e25b52cd.tar.bz2 qemu-3046c984049070ab5843da1753ce3a22e25b52cd.zip | |
Merge remote-tracking branch 'agraf/xen-next' into staging
Diffstat (limited to 'hw/pc_piix.c')
| -rw-r--r-- | hw/pc_piix.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 2b9c2b113c..c0a2abe4bc 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -160,7 +160,11 @@ static void pc_init1(MemoryRegion *system_memory, 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 { |