motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 00:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'agraf/xen-next' into staging

Browse source
This commit is contained in:
Anthony Liguori 2011-07-29 09:42:12 -05:00
commit 3046c98404
10 changed files with 162 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hw/pc_piix.c
View file

@ -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 {