Commit 6cd38783 authored by Stefano Stabellini's avatar Stefano Stabellini
Browse files

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: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
parent 2a3612cc

hw/ide/piix.c

+7 −0
Original line number Diff line number Diff line
@@ -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);

        }

    }