xen: Fix IDE unplug

After commit e5e7855 (blockdev: Separate BB name management), starting a
guest with PVHVM support result in this assert:
qemu-system-i386: block/block-backend.c:173: blk_delete: Assertion `!blk->name' failed.

A backtrace show that a caller is pci_piix3_xen_ide_unplug().

This patch fix it.

Signed-off-by: Anthony PERARD <[email protected]>
Message-id: 1460382666[email protected]
Signed-off-by: John Snow <[email protected]>

diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index 0a4cbcbcbb64d304920ef266a31e111996f61767..6d76ce980b93ff7c1bf070fdaff98bc5ff9469ff 100644 (file)
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -189,6 +189,7 @@ int pci_piix3_xen_ide_unplug(DeviceState *dev)
                 idedev = pci_ide->bus[di->bus].slave;
             }
             idedev->conf.blk = NULL;
+            monitor_remove_blk(blk);
             blk_unref(blk);
         }
     }