diff options
| -rw-r--r-- | block-qcow2.c | 47 |
1 files changed, 20 insertions, 27 deletions
diff --git a/block-qcow2.c b/block-qcow2.c index e1c3343f20..f55a4e4792 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_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; - 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 ? */ @@ -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; - 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; |