[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/22] vdi: Fix .bdrv_co_create(_opts) to open images with no_co_w
From: |
Kevin Wolf |
Subject: |
[PULL 12/22] vdi: Fix .bdrv_co_create(_opts) to open images with no_co_wrapper |
Date: |
Fri, 17 Feb 2023 16:09:44 +0100 |
.bdrv_co_create implementations run in a coroutine. Therefore they are
not allowed to open images directly. Fix the calls to use the
corresponding no_co_wrappers instead.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20230126172432.436111-9-kwolf@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/vdi.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/block/vdi.c b/block/vdi.c
index 9c8736b26f..27db67d493 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -800,14 +800,14 @@ static int coroutine_fn
vdi_co_do_create(BlockdevCreateOptions *create_options,
}
/* Create BlockBackend to write to the image */
- bs_file = bdrv_open_blockdev_ref(vdi_opts->file, errp);
+ bs_file = bdrv_co_open_blockdev_ref(vdi_opts->file, errp);
if (!bs_file) {
ret = -EIO;
goto exit;
}
- blk = blk_new_with_bs(bs_file, BLK_PERM_WRITE | BLK_PERM_RESIZE,
- BLK_PERM_ALL, errp);
+ blk = blk_co_new_with_bs(bs_file, BLK_PERM_WRITE | BLK_PERM_RESIZE,
+ BLK_PERM_ALL, errp);
if (!blk) {
ret = -EPERM;
goto exit;
@@ -940,8 +940,8 @@ static int coroutine_fn vdi_co_create_opts(BlockDriver *drv,
goto done;
}
- bs_file = bdrv_open(filename, NULL, NULL,
- BDRV_O_RDWR | BDRV_O_RESIZE | BDRV_O_PROTOCOL, errp);
+ bs_file = bdrv_co_open(filename, NULL, NULL,
+ BDRV_O_RDWR | BDRV_O_RESIZE | BDRV_O_PROTOCOL,
errp);
if (!bs_file) {
ret = -EIO;
goto done;
--
2.39.2
- [PULL 00/22] Block layer patches, Kevin Wolf, 2023/02/17
- [PULL 01/22] util/qemu-thread-posix: use TSA_NO_TSA to suppress clang TSA warnings in FreeBSD, Kevin Wolf, 2023/02/17
- [PULL 04/22] curl: Fix error path in curl_open(), Kevin Wolf, 2023/02/17
- [PULL 03/22] configure: Enable -Wthread-safety if present, Kevin Wolf, 2023/02/17
- [PULL 02/22] bsd-user/mmap: use TSA_NO_TSA to suppress clang TSA warnings in FreeBSD, Kevin Wolf, 2023/02/17
- [PULL 06/22] block: Create no_co_wrappers for open functions, Kevin Wolf, 2023/02/17
- [PULL 09/22] qcow: Fix .bdrv_co_create(_opts) to open images with no_co_wrapper, Kevin Wolf, 2023/02/17
- [PULL 12/22] vdi: Fix .bdrv_co_create(_opts) to open images with no_co_wrapper,
Kevin Wolf <=
- [PULL 08/22] parallels: Fix .bdrv_co_create(_opts) to open images with no_co_wrapper, Kevin Wolf, 2023/02/17
- [PULL 17/22] block: Assert non-coroutine context for bdrv_open_inherit(), Kevin Wolf, 2023/02/17
- [PULL 13/22] vhdx: Fix .bdrv_co_create(_opts) to open images with no_co_wrapper, Kevin Wolf, 2023/02/17
- [PULL 05/22] block-coroutine-wrapper: Introduce no_co_wrapper, Kevin Wolf, 2023/02/17
- [PULL 07/22] luks: Fix .bdrv_co_create(_opts) to open images with no_co_wrapper, Kevin Wolf, 2023/02/17
- [PULL 18/22] block: Handle curl 7.55.0, 7.85.0 version changes, Kevin Wolf, 2023/02/17
- [PULL 11/22] qed: Fix .bdrv_co_create(_opts) to open images with no_co_wrapper, Kevin Wolf, 2023/02/17
- [PULL 10/22] qcow2: Fix open/create to open images with no_co_wrapper, Kevin Wolf, 2023/02/17
- [PULL 19/22] block: temporarily hold the new AioContext of bs_top in bdrv_append(), Kevin Wolf, 2023/02/17
- [PULL 20/22] MAINTAINERS: drop Vladimir from parallels block driver, Kevin Wolf, 2023/02/17