[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/5] Introduce new helper function qcow_shedule_bh()
From: |
Gleb Natapov |
Subject: |
[Qemu-devel] [PATCH 2/5] Introduce new helper function qcow_shedule_bh(). |
Date: |
Sun, 23 Nov 2008 16:53:05 +0200 |
User-agent: |
StGIT/0.14.2 |
Use it to remove code duplications from qcow_aio_read_cb().
Signed-off-by: Gleb Natapov <address@hidden>
---
block-qcow2.c | 44 +++++++++++++++++---------------------------
1 files changed, 17 insertions(+), 27 deletions(-)
diff --git a/block-qcow2.c b/block-qcow2.c
index ab19a4e..69f6414 100644
--- a/block-qcow2.c
+++ b/block-qcow2.c
@@ -1177,6 +1177,20 @@ static void qcow_aio_read_bh(void *opaque)
qcow_aio_read_cb(opaque, 0);
}
+static int qcow_shedule_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,14 @@ fail:
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;
+ if((ret = qcow_shedule_bh(qcow_aio_read_bh, acb)) < 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;
+ if((ret = qcow_shedule_bh(qcow_aio_read_bh, acb)) < 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 +1261,8 @@ fail:
goto fail;
memcpy(acb->buf,
s->cluster_cache + index_in_cluster * 512, 512 * acb->n);
- if (acb->bh) {
- ret = -EIO;
+ if((ret = qcow_shedule_bh(qcow_aio_read_bh, acb)) < 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;