commit d7086422b1c1e75e320519cfe26176db6ec97a37
author Kevin Wolf <kwolf@redhat.com> Fri Jan 13 19:02:32 2017 +0100
committer Kevin Wolf <kwolf@redhat.com> Tue Feb 28 20:40:36 2017 +0100
tree 5b8cc8a489ee05f6432288590f1b621bccfa39c4
parent 6d0eb64d5c6d57017c52a4f36ccae1db79215ee1

block: Add error parameter to blk_insert_bs()

Now that blk_insert_bs() requests the BlockBackend permissions for the
node it attaches to, it can fail. Instead of aborting, pass the errors
to the callers.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Acked-by: Fam Zheng <famz@redhat.com>

block.c

diff --git a/block.c b/block.c
index 41b8b11..5f2dd6f 100644
--- a/block.c
+++ b/block.c
@@ -2194,8 +2194,11 @@
         }
         if (file_bs != NULL) {
             file = blk_new(BLK_PERM_CONSISTENT_READ, BLK_PERM_ALL);
-            blk_insert_bs(file, file_bs);
+            blk_insert_bs(file, file_bs, &local_err);
             bdrv_unref(file_bs);
+            if (local_err) {
+                goto fail;
+            }
 
             qdict_put(options, "file",
                       qstring_from_str(bdrv_get_node_name(file_bs)));