From: Anthony PERARD <anthony.perard@citrix.com>
Date: Tue, 12 Apr 2016 20:47:52 +0000 (-0400)
Subject: xen: Fix IDE unplug
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d1fc684f3692d6bbe85d5ee35c2568f0bc68fa1c;p=qemu.git

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>
---

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);
         }
     }