[Xen-changelog] [qemu-upstream-unstable] Fix release_drive on unplugged devices (pci_piix3_xen_ide_unplug)

[patchbot@xxxxxxx]

commit bcf35eec0b621c46dbf0aeb40c6bc06b5d3981aa
Author:     Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
AuthorDate: Mon Aug 3 13:56:57 2015 +0000
Commit:     Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
CommitDate: Mon Aug 3 13:56:57 2015 +0000

    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 <kwolf@xxxxxxxxxx>
    Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
---
 hw/ide/piix.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index b0172fb..2bacf53 100644
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -172,6 +172,7 @@ int pci_piix3_xen_ide_unplug(DeviceState *dev)
     PCIIDEState *pci_ide;
     DriveInfo *di;
     int i;
+    IDEDevice *idedev;
 
     pci_ide = PCI_IDE(dev);
 
@@ -184,6 +185,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);
         }
     }
--
generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog