diff options
| author | Peter Maydell | 2014-02-24 17:12:55 +0100 |
|---|---|---|
| committer | Peter Maydell | 2014-02-24 17:12:55 +0100 |
| commit | c58e291591dbc1c846fa152d4792554803405ebb (patch) | |
| tree | 7ecea8fea0dda60ba8b702abd5d1d35dcca0ef5c /include | |
| parent | Merge remote-tracking branch 'remotes/bonzini/configure' into staging (diff) | |
| parent | xen_disk: fix io accounting (diff) | |
| download | qemu-c58e291591dbc1c846fa152d4792554803405ebb.tar.gz qemu-c58e291591dbc1c846fa152d4792554803405ebb.tar.xz qemu-c58e291591dbc1c846fa152d4792554803405ebb.zip | |
Merge remote-tracking branch 'remotes/sstabellini/xen-140220' into staging
* remotes/sstabellini/xen-140220:
xen_disk: fix io accounting
Call pci_piix3_xen_ide_unplug from unplug_disks
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/ide.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/hw/ide.h b/include/hw/ide.h index 507e6d33cb..bc8bd321a2 100644 --- a/include/hw/ide.h +++ b/include/hw/ide.h @@ -17,6 +17,7 @@ void pci_cmd646_ide_init(PCIBus *bus, DriveInfo **hd_table, PCIDevice *pci_piix3_xen_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); PCIDevice *pci_piix3_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); PCIDevice *pci_piix4_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); +int pci_piix3_xen_ide_unplug(DeviceState *dev); void vt82c686b_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn); /* ide-mmio.c */ |