From: Fam Zheng <[email protected]> The logic will be fixed (extended), move it to a separate function.
Signed-off-by: Fam Zheng <[email protected]> Message-Id: <[email protected]> Reviewed-by: Stefan Hajnoczi <[email protected]> Signed-off-by: Eric Blake <[email protected]> --- block/block-backend.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/block/block-backend.c b/block/block-backend.c index e9798e897d..a3984d2bec 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -192,19 +192,28 @@ static void blk_root_activate(BdrvChild *child, Error **errp) } } -static int blk_root_inactivate(BdrvChild *child) +static bool blk_can_inactivate(BlockBackend *blk) { - BlockBackend *blk = child->opaque; - - if (blk->disable_perm) { - return 0; - } - /* Only inactivate BlockBackends for guest devices (which are inactive at * this point because the VM is stopped) and unattached monitor-owned * BlockBackends. If there is still any other user like a block job, then * we simply can't inactivate the image. */ - if (!blk->dev && !blk_name(blk)[0]) { + if (blk->dev || blk_name(blk)[0]) { + return true; + } + + return false; +} + +static int blk_root_inactivate(BdrvChild *child) +{ + BlockBackend *blk = child->opaque; + + if (blk->disable_perm) { + return 0; + } + + if (!blk_can_inactivate(blk)) { return -EPERM; } -- 2.13.5
