commit a3aeeab557f08285c4fcf537fca575b069eb67ef
author Eric Blake <eblake@redhat.com> Tue Apr 28 14:26:46 2020 -0500
committer Max Reitz <mreitz@redhat.com> Tue May 05 13:17:36 2020 +0200
tree c7baa354e4f6b9bd1d62f570c2da8cb84e6397c5
parent 52ea799e9631ff00c230f1fed50986246149d8f2

block: Add blk_new_with_bs() helper

There are several callers that need to create a new block backend from
an existing BDS; make the task slightly easier with a common helper
routine.

Suggested-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200424190903.522087-2-eblake@redhat.com>
[mreitz: Set @ret only in error paths, see
 https://lists.nongnu.org/archive/html/qemu-block/2020-04/msg01216.html]
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20200428192648.749066-2-eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>

block/vdi.c

diff --git a/block/vdi.c b/block/vdi.c
index 0c7835a..2d28046 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -804,10 +804,10 @@
         goto exit;
     }
 
-    blk = blk_new(bdrv_get_aio_context(bs_file),
-                  BLK_PERM_WRITE | BLK_PERM_RESIZE, BLK_PERM_ALL);
-    ret = blk_insert_bs(blk, bs_file, errp);
-    if (ret < 0) {
+    blk = blk_new_with_bs(bs_file, BLK_PERM_WRITE | BLK_PERM_RESIZE,
+                          BLK_PERM_ALL, errp);
+    if (!blk) {
+        ret = -EPERM;
         goto exit;
     }