mirror of https://gitlab.com/qemu-project/qemu
qcow2: make qcow2_do_open a coroutine_fn
It is called from qcow2_invalidate_cache in coroutine context (incoming migration runs in a coroutine), so it's cleaner if metadata is always loaded from a coroutine. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <1516279431-30424-4-git-send-email-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
1a0c2bfb03
commit
1fafcd9368
|
@ -1118,8 +1118,9 @@ static int qcow2_update_options(BlockDriverState *bs, QDict *options,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int qcow2_do_open(BlockDriverState *bs, QDict *options, int flags,
|
/* Called with s->lock held. */
|
||||||
Error **errp)
|
static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,
|
||||||
|
int flags, Error **errp)
|
||||||
{
|
{
|
||||||
BDRVQcow2State *s = bs->opaque;
|
BDRVQcow2State *s = bs->opaque;
|
||||||
unsigned int len, i;
|
unsigned int len, i;
|
||||||
|
@ -1498,8 +1499,6 @@ static int qcow2_do_open(BlockDriverState *bs, QDict *options, int flags,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Initialise locks */
|
|
||||||
qemu_co_mutex_init(&s->lock);
|
|
||||||
bs->supported_zero_flags = header.version >= 3 ? BDRV_REQ_MAY_UNMAP : 0;
|
bs->supported_zero_flags = header.version >= 3 ? BDRV_REQ_MAY_UNMAP : 0;
|
||||||
|
|
||||||
/* Repair image if dirty */
|
/* Repair image if dirty */
|
||||||
|
@ -1545,16 +1544,53 @@ static int qcow2_do_open(BlockDriverState *bs, QDict *options, int flags,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
typedef struct QCow2OpenCo {
|
||||||
|
BlockDriverState *bs;
|
||||||
|
QDict *options;
|
||||||
|
int flags;
|
||||||
|
Error **errp;
|
||||||
|
int ret;
|
||||||
|
} QCow2OpenCo;
|
||||||
|
|
||||||
|
static void coroutine_fn qcow2_open_entry(void *opaque)
|
||||||
|
{
|
||||||
|
QCow2OpenCo *qoc = opaque;
|
||||||
|
BDRVQcow2State *s = qoc->bs->opaque;
|
||||||
|
|
||||||
|
qemu_co_mutex_lock(&s->lock);
|
||||||
|
qoc->ret = qcow2_do_open(qoc->bs, qoc->options, qoc->flags, qoc->errp);
|
||||||
|
qemu_co_mutex_unlock(&s->lock);
|
||||||
|
}
|
||||||
|
|
||||||
static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,
|
static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,
|
||||||
Error **errp)
|
Error **errp)
|
||||||
{
|
{
|
||||||
|
BDRVQcow2State *s = bs->opaque;
|
||||||
|
QCow2OpenCo qoc = {
|
||||||
|
.bs = bs,
|
||||||
|
.options = options,
|
||||||
|
.flags = flags,
|
||||||
|
.errp = errp,
|
||||||
|
.ret = -EINPROGRESS
|
||||||
|
};
|
||||||
|
|
||||||
bs->file = bdrv_open_child(NULL, options, "file", bs, &child_file,
|
bs->file = bdrv_open_child(NULL, options, "file", bs, &child_file,
|
||||||
false, errp);
|
false, errp);
|
||||||
if (!bs->file) {
|
if (!bs->file) {
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
return qcow2_do_open(bs, options, flags, errp);
|
/* Initialise locks */
|
||||||
|
qemu_co_mutex_init(&s->lock);
|
||||||
|
|
||||||
|
if (qemu_in_coroutine()) {
|
||||||
|
/* From bdrv_co_create. */
|
||||||
|
qcow2_open_entry(&qoc);
|
||||||
|
} else {
|
||||||
|
qemu_coroutine_enter(qemu_coroutine_create(qcow2_open_entry, &qoc));
|
||||||
|
BDRV_POLL_WHILE(bs, qoc.ret == -EINPROGRESS);
|
||||||
|
}
|
||||||
|
return qoc.ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void qcow2_refresh_limits(BlockDriverState *bs, Error **errp)
|
static void qcow2_refresh_limits(BlockDriverState *bs, Error **errp)
|
||||||
|
|
Loading…
Reference in New Issue