OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

block-backend: Refactor inactivate check

Browse Source 
The logic will be fixed (extended), move it to a separate function.

Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <20170823134242.12080-2-famz@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Fam Zheng 2017-08-23 21:42:39 +08:00 committed by Eric Blake
parent 3da2bd8c4a
commit c16de8f59a
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
block/block-backend.c
View File

@ -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;
}