diff mbox

block: forbid x-blockdev-del from acting on DriveInfo

Message ID 1459429663-1230-1-git-send-email-pbonzini@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Paolo Bonzini March 31, 2016, 1:07 p.m. UTC 
Failing on -drive/drive_add created BlockBackends was a
requirement for x-blockdev-del, but it sneaked through
the patch review.  Let's fix it now.

Example:

$ x86_64-softmmu/qemu-system-x86_64 -drive if=none,file=null-co://,id=null -qmp stdio
>> {'execute':'qmp_capabilities'}
<< {"return": {}}
>> {'execute':'x-blockdev-del','arguments':{'id':'null'}}
<< {"error": {"class": "GenericError", "desc": "Deleting block backend added with drive-add is not supported"}}

And without a DriveInfo:

>> { "execute": "blockdev-add", "arguments": { "options": { "driver":"null-co", "id":"null2"}}}
<< {"return": {}}
>> {'execute':'x-blockdev-del','arguments':{'id':'null2'}}
<< {"return": {}}

Suggested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 blockdev.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Kevin Wolf April 4, 2016, 10:53 a.m. UTC | #1 
Am 31.03.2016 um 15:07 hat Paolo Bonzini geschrieben:
> Failing on -drive/drive_add created BlockBackends was a
> requirement for x-blockdev-del, but it sneaked through
> the patch review.  Let's fix it now.
> 
> Example:
> 
> $ x86_64-softmmu/qemu-system-x86_64 -drive if=none,file=null-co://,id=null -qmp stdio
> >> {'execute':'qmp_capabilities'}
> << {"return": {}}
> >> {'execute':'x-blockdev-del','arguments':{'id':'null'}}
> << {"error": {"class": "GenericError", "desc": "Deleting block backend added with drive-add is not supported"}}
> 
> And without a DriveInfo:
> 
> >> { "execute": "blockdev-add", "arguments": { "options": { "driver":"null-co", "id":"null2"}}}
> << {"return": {}}
> >> {'execute':'x-blockdev-del','arguments':{'id':'null2'}}
> << {"return": {}}
> 
> Suggested-by: Kevin Wolf <kwolf@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Thanks, applied to the block branch.

Kevin
diff mbox

Patch

diff --git a/blockdev.c b/blockdev.c
index e50e8ea..332068a 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -4027,6 +4027,11 @@  void qmp_x_blockdev_del(bool has_id, const char *id,
             error_setg(errp, "Cannot find block backend %s", id);
             return;
         }
+        if (blk_legacy_dinfo(blk)) {
+            error_setg(errp, "Deleting block backend added with drive-add"
+                       " is not supported");
+            return;
+        }
         if (blk_get_refcnt(blk) > 1) {
             error_setg(errp, "Block backend %s is in use", id);
             return;