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

qcow2: make qcow2_co_create2() a coroutine_fn

Browse Source 
qcow2_create2() calls qemu_co_mutex_lock().  Only a coroutine_fn may
call another coroutine_fn.  In fact, qcow2_create2 is always called from
coroutine context.

Rename the function to add the "co" moniker and add coroutine_fn.

Reported-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20170705102231.20711-3-stefanha@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2018-01-18 13:43:46 +01:00 committed by Kevin Wolf
parent efc75e2a4c
commit c274393a3e
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
block/qcow2.c
View File

@ -2725,11 +2725,12 @@ static uint64_t qcow2_opt_get_refcount_bits_del(QemuOpts *opts, int version,
return refcount_bits; return refcount_bits;
} }
static int qcow2_create2(const char *filename, int64_t total_size, static int coroutine_fn
const char *backing_file, const char *backing_format, qcow2_co_create2(const char *filename, int64_t total_size,
int flags, size_t cluster_size, PreallocMode prealloc, const char *backing_file, const char *backing_format,
QemuOpts *opts, int version, int refcount_order, int flags, size_t cluster_size, PreallocMode prealloc,
const char *encryptfmt, Error **errp) QemuOpts *opts, int version, int refcount_order,
const char *encryptfmt, Error **errp)
{ {
QDict *options; QDict *options;
@ -2998,9 +2999,9 @@ static int coroutine_fn qcow2_co_create_opts(const char *filename, QemuOpts *opt
refcount_order = ctz32(refcount_bits); refcount_order = ctz32(refcount_bits);
ret = qcow2_create2(filename, size, backing_file, backing_fmt, flags, ret = qcow2_co_create2(filename, size, backing_file, backing_fmt, flags,
cluster_size, prealloc, opts, version, refcount_order, cluster_size, prealloc, opts, version, refcount_order,
encryptfmt, &local_err); encryptfmt, &local_err);
error_propagate(errp, local_err); error_propagate(errp, local_err);
finish: finish: