diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-02-24 16:12:55 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-02-24 16:12:55 +0000 |
| commit | c58e291591dbc1c846fa152d4792554803405ebb (patch) | |
| tree | 7ecea8fea0dda60ba8b702abd5d1d35dcca0ef5c /hw/xen/xen_platform.c | |
| parent | 6dedf0522c3fdeb10fe27d4aef35f4c57f3d0806 (diff) | |
| parent | 58da5b1e01a586eb5a52ba3eec342d6828269839 (diff) | |
| download | focaccia-qemu-c58e291591dbc1c846fa152d4792554803405ebb.tar.gz focaccia-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 'hw/xen/xen_platform.c')
| -rw-r--r-- | hw/xen/xen_platform.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/xen/xen_platform.c b/hw/xen/xen_platform.c index 70875e4122..1d9d0e9f25 100644 --- a/hw/xen/xen_platform.c +++ b/hw/xen/xen_platform.c @@ -27,6 +27,7 @@ #include "hw/hw.h" #include "hw/i386/pc.h" +#include "hw/ide.h" #include "hw/pci/pci.h" #include "hw/irq.h" #include "hw/xen/xen_common.h" @@ -110,7 +111,7 @@ static void unplug_disks(PCIBus *b, PCIDevice *d, void *o) if (pci_get_word(d->config + PCI_CLASS_DEVICE) == PCI_CLASS_STORAGE_IDE && strcmp(d->name, "xen-pci-passthrough") != 0) { - qdev_unplug(DEVICE(d), NULL); + pci_piix3_xen_ide_unplug(DEVICE(d)); } } |