summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony PERARD <anthony.perard@citrix.com>2016-04-12 16:47:52 -0400
committerJohn Snow <jsnow@redhat.com>2016-04-12 16:47:52 -0400
commitd1fc684f3692d6bbe85d5ee35c2568f0bc68fa1c (patch)
treec2f211beef558f8a4905c79ea025409c9a03f0b6
parentd44122ecd0fa62d20762bdd8f214f077cb8e011b (diff)
downloadqemu-d1fc684f3692d6bbe85d5ee35c2568f0bc68fa1c.tar.gz
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 <anthony.perard@citrix.com> Message-id: 1460382666-29885-1-git-send-email-anthony.perard@citrix.com Signed-off-by: John Snow <jsnow@redhat.com>
-rw-r--r--hw/ide/piix.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index 0a4cbcbcbb..6d76ce980b 100644
--- 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);
}
}