From: Kevin Wolf <kwolf@redhat.com>
Date: Tue, 23 Feb 2016 16:50:37 +0000 (+0100)
Subject: hmp: Extend drive_del to delete nodes without BB
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2073d410ce3f2b1507bccd6aba68e8808647f9a9;p=qemu.git

hmp: Extend drive_del to delete nodes without BB

Now that we can use drive_add to create new nodes without a BB, we also
want to be able to delete such nodes again.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---

diff --git a/blockdev.c b/blockdev.c
index 1297c90512..322ca03908 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2824,6 +2824,15 @@ void hmp_drive_del(Monitor *mon, const QDict *qdict)
     AioContext *aio_context;
     Error *local_err = NULL;
 
+    bs = bdrv_find_node(id);
+    if (bs) {
+        qmp_x_blockdev_del(false, NULL, true, id, &local_err);
+        if (local_err) {
+            error_report_err(local_err);
+        }
+        return;
+    }
+
     blk = blk_by_name(id);
     if (!blk) {
         error_report("Device '%s' not found", id);