From c16de8f59a2bcbe2dc037524cc648de896f581a4 Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Wed, 23 Aug 2017 21:42:39 +0800 Subject: [PATCH] block-backend: Refactor inactivate check The logic will be fixed (extended), move it to a separate function. Signed-off-by: Fam Zheng Message-Id: <20170823134242.12080-2-famz@redhat.com> Reviewed-by: Stefan Hajnoczi Signed-off-by: Eric Blake --- block/block-backend.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 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,6 +192,19 @@ static void blk_root_activate(BdrvChild *child, Error **errp) } } +static bool blk_can_inactivate(BlockBackend *blk) +{ + /* 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]) { + return true; + } + + return false; +} + static int blk_root_inactivate(BdrvChild *child) { BlockBackend *blk = child->opaque; @@ -200,11 +213,7 @@ static int blk_root_inactivate(BdrvChild *child) 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_can_inactivate(blk)) { return -EPERM; }