From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>
Subject: [Qemu-devel] [PATCH v2 01/15] sheepdog: add coroutine_fn markers
Date: Fri, 16 Sep 2011 16:25:38 +0200 [thread overview]
Message-ID: <1316183152-5481-2-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1316183152-5481-1-git-send-email-pbonzini@redhat.com>
This makes the following patch easier to review.
Cc: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
block/sheepdog.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/block/sheepdog.c b/block/sheepdog.c
index c1f6e07..af696a5 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -396,7 +396,7 @@ static inline int free_aio_req(BDRVSheepdogState *s, AIOReq *aio_req)
return !QLIST_EMPTY(&acb->aioreq_head);
}
-static void sd_finish_aiocb(SheepdogAIOCB *acb)
+static void coroutine_fn sd_finish_aiocb(SheepdogAIOCB *acb)
{
if (!acb->canceled) {
qemu_coroutine_enter(acb->coroutine, NULL);
@@ -735,7 +735,7 @@ out:
return ret;
}
-static int add_aio_request(BDRVSheepdogState *s, AIOReq *aio_req,
+static int coroutine_fn add_aio_request(BDRVSheepdogState *s, AIOReq *aio_req,
struct iovec *iov, int niov, int create,
enum AIOCBState aiocb_type);
@@ -743,7 +743,7 @@ static int add_aio_request(BDRVSheepdogState *s, AIOReq *aio_req,
* This function searchs pending requests to the object `oid', and
* sends them.
*/
-static void send_pending_req(BDRVSheepdogState *s, uint64_t oid, uint32_t id)
+static void coroutine_fn send_pending_req(BDRVSheepdogState *s, uint64_t oid, uint32_t id)
{
AIOReq *aio_req, *next;
SheepdogAIOCB *acb;
@@ -777,7 +777,7 @@ static void send_pending_req(BDRVSheepdogState *s, uint64_t oid, uint32_t id)
* This function is registered as a fd handler, and called from the
* main loop when s->fd is ready for reading responses.
*/
-static void aio_read_response(void *opaque)
+static void coroutine_fn aio_read_response(void *opaque)
{
SheepdogObjRsp rsp;
BDRVSheepdogState *s = opaque;
@@ -1064,7 +1064,7 @@ out:
return ret;
}
-static int add_aio_request(BDRVSheepdogState *s, AIOReq *aio_req,
+static int coroutine_fn add_aio_request(BDRVSheepdogState *s, AIOReq *aio_req,
struct iovec *iov, int niov, int create,
enum AIOCBState aiocb_type)
{
@@ -1517,7 +1517,7 @@ static int sd_truncate(BlockDriverState *bs, int64_t offset)
* update metadata, this sends a write request to the vdi object.
* Otherwise, this switches back to sd_co_readv/writev.
*/
-static void sd_write_done(SheepdogAIOCB *acb)
+static void coroutine_fn sd_write_done(SheepdogAIOCB *acb)
{
int ret;
BDRVSheepdogState *s = acb->common.bs->opaque;
@@ -1615,7 +1615,7 @@ out:
* Returns 1 when we need to wait a response, 0 when there is no sent
* request and -errno in error cases.
*/
-static int sd_co_rw_vector(void *p)
+static int coroutine_fn sd_co_rw_vector(void *p)
{
SheepdogAIOCB *acb = p;
int ret = 0;
--
1.7.6
next prev parent reply other threads:[~2011-09-16 14:26 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-16 14:25 [Qemu-devel] [PATCH v2 00/15] nbd improvements Paolo Bonzini
2011-09-16 14:25 ` Paolo Bonzini [this message]
2011-09-17 5:32 ` [Qemu-devel] [PATCH v2 01/15] sheepdog: add coroutine_fn markers MORITA Kazutaka
2011-09-16 14:25 ` [Qemu-devel] [PATCH v2 02/15] add socket_set_block Paolo Bonzini
2011-09-17 5:33 ` MORITA Kazutaka
2011-09-16 14:25 ` [Qemu-devel] [PATCH v2 03/15] sheepdog: move coroutine send/recv function to generic code Paolo Bonzini
2011-09-17 6:29 ` MORITA Kazutaka
2011-09-17 14:49 ` Paolo Bonzini
2011-09-17 17:16 ` MORITA Kazutaka
2011-09-19 7:47 ` Kevin Wolf
2011-09-19 9:34 ` Paolo Bonzini
2011-09-16 14:25 ` [Qemu-devel] [PATCH v2 04/15] coroutine-io: handle zero returns from recv Paolo Bonzini
2011-09-17 6:50 ` MORITA Kazutaka
2011-09-16 14:25 ` [Qemu-devel] [PATCH v2 05/15] block: emulate .bdrv_flush() using .bdrv_aio_flush() Paolo Bonzini
2011-09-16 14:25 ` [Qemu-devel] [PATCH v2 06/15] block: group together the plugging of synchronous IO emulation Paolo Bonzini
2011-09-16 14:25 ` [Qemu-devel] [PATCH v2 07/15] block: add bdrv_co_flush support Paolo Bonzini
2011-09-16 14:25 ` [Qemu-devel] [PATCH v2 08/15] block: add bdrv_co_discard and bdrv_aio_discard support Paolo Bonzini
2011-09-16 14:25 ` [Qemu-devel] [PATCH v2 09/15] nbd: fix error handling in the server Paolo Bonzini
2011-09-16 14:25 ` [Qemu-devel] [PATCH v2 10/15] nbd: add support for NBD_CMD_FLUSH Paolo Bonzini
2011-09-16 14:25 ` [Qemu-devel] [PATCH v2 11/15] nbd: add support for NBD_CMD_FLAG_FUA Paolo Bonzini
2011-09-16 14:25 ` [Qemu-devel] [PATCH v2 12/15] nbd: add support for NBD_CMD_TRIM Paolo Bonzini
2011-09-16 14:25 ` [Qemu-devel] [PATCH v2 13/15] nbd: switch to asynchronous operation Paolo Bonzini
2011-09-16 14:25 ` [Qemu-devel] [PATCH v2 14/15] nbd: split requests Paolo Bonzini
2011-09-16 14:25 ` [Qemu-devel] [PATCH v2 15/15] nbd: allow multiple in-flight requests Paolo Bonzini
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=1316183152-5481-2-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=morita.kazutaka@lab.ntt.co.jp \
--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).