[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 2/7] qcow2: make qcow2_co_create2() a coroutine_fn
From: |
Paolo Bonzini |
Subject: |
[Qemu-block] [PATCH 2/7] qcow2: make qcow2_co_create2() a coroutine_fn |
Date: |
Wed, 17 Jan 2018 12:25:07 +0100 |
From: Stefan Hajnoczi <address@hidden>
qcow2_create2() calls qemu_co_mutex_lock(). Only a coroutine_fn may
call another coroutine_fn.
Rename the function (the block layer API is now called
.bdrv_co_create()) and add coroutine_fn. It is always called from
coroutine context.
Reported-by: Marc-André Lureau <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
block/qcow2.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index be2d485..fec065b 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -2690,11 +2690,12 @@ static uint64_t
qcow2_opt_get_refcount_bits_del(QemuOpts *opts, int version,
return refcount_bits;
}
-static int qcow2_create2(const char *filename, int64_t total_size,
- const char *backing_file, const char *backing_format,
- int flags, size_t cluster_size, PreallocMode prealloc,
- QemuOpts *opts, int version, int refcount_order,
- const char *encryptfmt, Error **errp)
+static int coroutine_fn
+qcow2_co_create2(const char *filename, int64_t total_size,
+ const char *backing_file, const char *backing_format,
+ int flags, size_t cluster_size, PreallocMode prealloc,
+ QemuOpts *opts, int version, int refcount_order,
+ const char *encryptfmt, Error **errp)
{
QDict *options;
@@ -2963,9 +2964,9 @@ static int coroutine_fn qcow2_co_create(const char
*filename, QemuOpts *opts,
refcount_order = ctz32(refcount_bits);
- ret = qcow2_create2(filename, size, backing_file, backing_fmt, flags,
- cluster_size, prealloc, opts, version, refcount_order,
- encryptfmt, &local_err);
+ ret = qcow2_co_create2(filename, size, backing_file, backing_fmt, flags,
+ cluster_size, prealloc, opts, version,
refcount_order,
+ encryptfmt, &local_err);
error_propagate(errp, local_err);
finish:
--
1.8.3.1
- [Qemu-block] [PATCH v2 0/7] Call check and invalidate_cache from coroutine context, Paolo Bonzini, 2018/01/17
- [Qemu-block] [PATCH 2/7] qcow2: make qcow2_co_create2() a coroutine_fn,
Paolo Bonzini <=
- [Qemu-block] [PATCH 3/7] qcow2: make qcow2_do_open a coroutine_fn, Paolo Bonzini, 2018/01/17
- [Qemu-block] [PATCH 4/7] qed: make bdrv_qed_do_open a coroutine_fn, Paolo Bonzini, 2018/01/17
- [Qemu-block] [PATCH 6/7] qcow2: introduce qcow2_write_caches and qcow2_flush_caches, Paolo Bonzini, 2018/01/17
- [Qemu-block] [PATCH 1/7] block: rename .bdrv_create() to .bdrv_co_create(), Paolo Bonzini, 2018/01/17
- [Qemu-block] [PATCH 5/7] block: convert bdrv_invalidate_cache callback to coroutine_fn, Paolo Bonzini, 2018/01/17
- [Qemu-block] [PATCH 7/7] block: convert bdrv_check callback to coroutine_fn, Paolo Bonzini, 2018/01/17
- Re: [Qemu-block] [PATCH v2 0/7] Call check and invalidate_cache from coroutine context, Kevin Wolf, 2018/01/17