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

qed: Remove callback from qed_write_header() 

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Kevin Wolf 2016-11-15 11:14:01 +01:00
parent 7076309aef
commit f13d712bb2
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
block/qed.c
View File

@ -98,8 +98,7 @@ int qed_write_header_sync(BDRVQEDState *s)
* This function only updates known header fields in-place and does not affect * This function only updates known header fields in-place and does not affect
* extra data after the QED header. * extra data after the QED header.
*/ */
static void qed_write_header(BDRVQEDState *s, BlockCompletionFunc cb, static int qed_write_header(BDRVQEDState *s)
void *opaque)
{ {
/* We must write full sectors for O_DIRECT but cannot necessarily generate /* We must write full sectors for O_DIRECT but cannot necessarily generate
* the data following the header if an unrecognized compat feature is * the data following the header if an unrecognized compat feature is
@ -137,7 +136,7 @@ static void qed_write_header(BDRVQEDState *s, BlockCompletionFunc cb,
ret = 0; ret = 0;
out: out:
qemu_vfree(buf); qemu_vfree(buf);
cb(opaque, ret); return ret;
} }
static uint64_t qed_max_image_size(uint32_t cluster_size, uint32_t table_size) static uint64_t qed_max_image_size(uint32_t cluster_size, uint32_t table_size)
@ -289,21 +288,6 @@ static void qed_unplug_allocating_write_reqs(BDRVQEDState *s)
} }
} }
static void qed_finish_clear_need_check(void *opaque, int ret)
{
/* Do nothing */
}
static void qed_flush_after_clear_need_check(void *opaque, int ret)
{
BDRVQEDState *s = opaque;
bdrv_aio_flush(s->bs, qed_finish_clear_need_check, s);
/* No need to wait until flush completes */
qed_unplug_allocating_write_reqs(s);
}
static void qed_clear_need_check(void *opaque, int ret) static void qed_clear_need_check(void *opaque, int ret)
{ {
BDRVQEDState *s = opaque; BDRVQEDState *s = opaque;
@ -314,7 +298,13 @@ static void qed_clear_need_check(void *opaque, int ret)
} }
s->header.features &= ~QED_F_NEED_CHECK; s->header.features &= ~QED_F_NEED_CHECK;
qed_write_header(s, qed_flush_after_clear_need_check, s); ret = qed_write_header(s);
(void) ret;
qed_unplug_allocating_write_reqs(s);
ret = bdrv_flush(s->bs);
(void) ret;
} }
static void qed_need_check_timer_cb(void *opaque) static void qed_need_check_timer_cb(void *opaque)
@ -1179,6 +1169,7 @@ static void qed_aio_write_alloc(QEDAIOCB *acb, size_t len)
{ {
BDRVQEDState *s = acb_to_s(acb); BDRVQEDState *s = acb_to_s(acb);
BlockCompletionFunc *cb; BlockCompletionFunc *cb;
int ret;
/* Cancel timer when the first allocating request comes in */ /* Cancel timer when the first allocating request comes in */
if (QSIMPLEQ_EMPTY(&s->allocating_write_reqs)) { if (QSIMPLEQ_EMPTY(&s->allocating_write_reqs)) {
@ -1213,7 +1204,8 @@ static void qed_aio_write_alloc(QEDAIOCB *acb, size_t len)
if (qed_should_set_need_check(s)) { if (qed_should_set_need_check(s)) {
s->header.features |= QED_F_NEED_CHECK; s->header.features |= QED_F_NEED_CHECK;
qed_write_header(s, cb, acb); ret = qed_write_header(s);
cb(acb, ret);
} else { } else {
cb(acb, 0); cb(acb, 0);
} }