From: Lin Ma <lma@suse.com>
Date: Fri, 3 Sep 2021 04:05:09 +0000 (+0800)
Subject: xen: remove BlockBackend object reference in xen_block_unrealize
X-Git-Tag: upstream/4.2.1~32
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=739c76503f946b715d3cf2b6e07d7e4e2bd3a6cc;p=tools%2Fqemu-arm-static.git

xen: remove BlockBackend object reference in xen_block_unrealize

References: bsc#1189234

Signed-off-by: Lin Ma <lma@suse.com>
---

diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c
index a06251da2..7667076ff 100644
--- a/hw/block/xen-block.c
+++ b/hw/block/xen-block.c
@@ -142,6 +142,7 @@ static void xen_block_unrealize(XenDevice *xendev, Error **errp)
         XEN_BLOCK_DEVICE_GET_CLASS(xendev);
     const char *type = object_get_typename(OBJECT(blockdev));
     XenBlockVdev *vdev = &blockdev->props.vdev;
+    BlockConf *conf = &blockdev->props.conf;
 
     if (vdev->type == XEN_BLOCK_VDEV_TYPE_INVALID) {
         return;
@@ -155,6 +156,8 @@ static void xen_block_unrealize(XenDevice *xendev, Error **errp)
     xen_block_dataplane_destroy(blockdev->dataplane);
     blockdev->dataplane = NULL;
 
+    monitor_remove_blk(conf->blk);
+
     if (blockdev_class->unrealize) {
         blockdev_class->unrealize(blockdev, errp);
     }