Commit 481e0eee authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

block: Improve "Block node is read-only" message 



This message does not make any sense when it appears as the response to
making an R/W node read-only.  We should detect that case and emit a
different message, then.

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarAlberto Garcia <berto@igalia.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 4db4390e

block.c

+16 −1
Original line number Diff line number Diff line
@@ -1709,6 +1709,8 @@ static int bdrv_child_check_perm(BdrvChild *c, BlockReopenQueue *q, 
                                 GSList *ignore_children, Error **errp);

static void bdrv_child_abort_perm_update(BdrvChild *c);

static void bdrv_child_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared);

static void bdrv_get_cumulative_perm(BlockDriverState *bs, uint64_t *perm,

                                     uint64_t *shared_perm);



typedef struct BlockReopenQueueEntry {

     bool prepared;
@@ -1795,7 +1797,20 @@ static int bdrv_check_perm(BlockDriverState *bs, BlockReopenQueue *q, 
    if ((cumulative_perms & (BLK_PERM_WRITE | BLK_PERM_WRITE_UNCHANGED)) &&

        !bdrv_is_writable_after_reopen(bs, q))

    {

        if (!bdrv_is_writable_after_reopen(bs, NULL)) {

            error_setg(errp, "Block node is read-only");

        } else {

            uint64_t current_perms, current_shared;

            bdrv_get_cumulative_perm(bs, &current_perms, &current_shared);

            if (current_perms & (BLK_PERM_WRITE | BLK_PERM_WRITE_UNCHANGED)) {

                error_setg(errp, "Cannot make block node read-only, there is "

                           "a writer on it");

            } else {

                error_setg(errp, "Cannot make block node read-only and create "

                           "a writer on it");

            }

        }



        return -EPERM;

    }