Skip to content

Commit

Permalink
Introduce new helper function qcow_shedule_bh() (Gleb Natapov)
Browse files Browse the repository at this point in the history
Use it to remove code duplications from qcow_aio_read_cb().

Signed-off-by: Gleb Natapov <[email protected]>
Signed-off-by: Anthony Liguori <[email protected]>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5858 c046a42c-6fe2-441c-8c8c-71466251a162
aliguori committed Dec 2, 2008
1 parent ac67488 commit a32ef78
Showing 1 changed file with 20 additions and 27 deletions.
47 changes: 20 additions & 27 deletions block-qcow2.c
Original file line number Diff line number Diff line change
@@ -1177,6 +1177,20 @@ static void qcow_aio_read_bh(void *opaque)
qcow_aio_read_cb(opaque, 0);
}

static int qcow_schedule_bh(QEMUBHFunc *cb, QCowAIOCB *acb)
{
if (acb->bh)
return -EIO;

acb->bh = qemu_bh_new(cb, acb);
if (!acb->bh)
return -EIO;

qemu_bh_schedule(acb->bh);

return 0;
}

static void qcow_aio_read_cb(void *opaque, int ret)
{
QCowAIOCB *acb = opaque;
@@ -1232,47 +1246,26 @@ static void qcow_aio_read_cb(void *opaque, int ret)
if (acb->hd_aiocb == NULL)
goto fail;
} else {
if (acb->bh) {
ret = -EIO;
goto fail;
}
acb->bh = qemu_bh_new(qcow_aio_read_bh, acb);
if (!acb->bh) {
ret = -EIO;
ret = qcow_schedule_bh(qcow_aio_read_bh, acb);
if (ret < 0)
goto fail;
}
qemu_bh_schedule(acb->bh);
}
} else {
/* Note: in this case, no need to wait */
memset(acb->buf, 0, 512 * acb->n);
if (acb->bh) {
ret = -EIO;
goto fail;
}
acb->bh = qemu_bh_new(qcow_aio_read_bh, acb);
if (!acb->bh) {
ret = -EIO;
ret = qcow_schedule_bh(qcow_aio_read_bh, acb);
if (ret < 0)
goto fail;
}
qemu_bh_schedule(acb->bh);
}
} else if (acb->cluster_offset & QCOW_OFLAG_COMPRESSED) {
/* add AIO support for compressed blocks ? */
if (decompress_cluster(s, acb->cluster_offset) < 0)
goto fail;
memcpy(acb->buf,
s->cluster_cache + index_in_cluster * 512, 512 * acb->n);
if (acb->bh) {
ret = -EIO;
goto fail;
}
acb->bh = qemu_bh_new(qcow_aio_read_bh, acb);
if (!acb->bh) {
ret = -EIO;
ret = qcow_schedule_bh(qcow_aio_read_bh, acb);
if (ret < 0)
goto fail;
}
qemu_bh_schedule(acb->bh);
} else {
if ((acb->cluster_offset & 511) != 0) {
ret = -EIO;

0 comments on commit a32ef78

Please sign in to comment.