Commit 5cf87fd6 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Kevin Wolf
Browse files

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

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: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 2e3a76ae

blockdev.c

+5 −0
Original line number Diff line number Diff line
@@ -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;