From: Anthony Liguori <anthony@codemonkey.ws>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [5858] Introduce new helper function qcow_shedule_bh() (Gleb Natapov)
Date: Tue, 02 Dec 2008 20:08:05 +0000 [thread overview]
Message-ID: <E1L7bXR-0003Ff-2Z@cvs.savannah.gnu.org> (raw)
Revision: 5858
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5858
Author: aliguori
Date: 2008-12-02 20:08:04 +0000 (Tue, 02 Dec 2008)
Log Message:
-----------
Introduce new helper function qcow_shedule_bh() (Gleb Natapov)
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>
Modified Paths:
--------------
trunk/block-qcow2.c
Modified: trunk/block-qcow2.c
===================================================================
--- trunk/block-qcow2.c 2008-12-02 20:06:51 UTC (rev 5857)
+++ trunk/block-qcow2.c 2008-12-02 20:08:04 UTC (rev 5858)
@@ -1177,6 +1177,20 @@
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 @@
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 @@
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;
reply other threads:[~2008-12-02 20:08 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1L7bXR-0003Ff-2Z@cvs.savannah.gnu.org \
--to=anthony@codemonkey.ws \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).