mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduce new helper function qcow_shedule_bh() (Gleb Natapov)

Browse Source 
Use it to remove code duplications from qcow_aio_read_cb().

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5858 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2008-12-02 20:08:04 +00:00
parent ac67488746
commit a32ef786f4
1 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
block-qcow2.c
View File

@ -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,30 +1246,16 @@ fail:
if (acb->hd_aiocb == NULL)
goto fail;
} else {
if (acb->bh) {
ret = -EIO;
ret = qcow_schedule_bh(qcow_aio_read_bh, acb);
if (ret < 0)
goto fail;
}
acb->bh = qemu_bh_new(qcow_aio_read_bh, acb);
if (!acb->bh) {
ret = -EIO;
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;
ret = qcow_schedule_bh(qcow_aio_read_bh, acb);
if (ret < 0)
goto fail;
}
acb->bh = qemu_bh_new(qcow_aio_read_bh, acb);
if (!acb->bh) {
ret = -EIO;
goto fail;
}
qemu_bh_schedule(acb->bh);
}
} else if (acb->cluster_offset & QCOW_OFLAG_COMPRESSED) {
/* add AIO support for compressed blocks ? */
@ -1263,16 +1263,9 @@ fail:
goto fail;
memcpy(acb->buf,
s->cluster_cache + index_in_cluster * 512, 512 * acb->n);
if (acb->bh) {
ret = -EIO;
ret = qcow_schedule_bh(qcow_aio_read_bh, acb);
if (ret < 0)
goto fail;
}
acb->bh = qemu_bh_new(qcow_aio_read_bh, acb);
if (!acb->bh) {
ret = -EIO;
goto fail;
}
qemu_bh_schedule(acb->bh);
} else {
if ((acb->cluster_offset & 511) != 0) {
ret = -EIO;