From c8bd74d1d509df5dd1afc6b79413f148f2889692 Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Mon, 3 Aug 2015 13:56:57 +0000 Subject: Fix release_drive on unplugged devices (pci_piix3_xen_ide_unplug) pci_piix3_xen_ide_unplug should completely unhook the unplugged IDEDevice from the corresponding BlockBackend, otherwise the next call to release_drive will try to detach the drive again. Suggested-by: Kevin Wolf Signed-off-by: Stefano Stabellini (cherry picked from commit 6cd387833d05e8ad31829d97e474dc420625aed9) Signed-off-by: Michael Roth --- hw/ide/piix.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/ide/piix.c b/hw/ide/piix.c index adb664957c..5a26c86a8a 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -169,6 +169,7 @@ int pci_piix3_xen_ide_unplug(DeviceState *dev) PCIIDEState *pci_ide; DriveInfo *di; int i; + IDEDevice *idedev; pci_ide = PCI_IDE(dev); @@ -181,6 +182,12 @@ int pci_piix3_xen_ide_unplug(DeviceState *dev) blk_detach_dev(blk, ds); } pci_ide->bus[di->bus].ifs[di->unit].blk = NULL; + if (!(i % 2)) { + idedev = pci_ide->bus[di->bus].master; + } else { + idedev = pci_ide->bus[di->bus].slave; + } + idedev->conf.blk = NULL; blk_unref(blk); } } -- cgit v1.2.1