[Qemu-devel] [PATCH] block:add coroutine_fn marker to coroutine functions

[Qemu-devel] [PATCH] block:add coroutine_fn marker to coroutine functions

[Dong Xu Wang]

From: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>

Looks better when reviewing these source files.

Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
---
 block/qcow.c     |    4 ++--
 block/qcow2.c    |    6 +++---
 block/sheepdog.c |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/block/qcow.c b/block/qcow.c
index 35e21eb..3620a29 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -425,7 +425,7 @@ static int decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset)
     return 0;
 }
 
-static int qcow_co_readv(BlockDriverState *bs, int64_t sector_num,
+static coroutine_fn int qcow_co_readv(BlockDriverState *bs, int64_t sector_num,
                          int nb_sectors, QEMUIOVector *qiov)
 {
     BDRVQcowState *s = bs->opaque;
@@ -523,7 +523,7 @@ fail:
     goto done;
 }
 
-static int qcow_co_writev(BlockDriverState *bs, int64_t sector_num,
+static coroutine_fn int qcow_co_writev(BlockDriverState *bs, int64_t sector_num,
                           int nb_sectors, QEMUIOVector *qiov)
 {
     BDRVQcowState *s = bs->opaque;
diff --git a/block/qcow2.c b/block/qcow2.c
index ef057d3..4924cfa 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -376,7 +376,7 @@ int qcow2_backing_read1(BlockDriverState *bs, QEMUIOVector *qiov,
     return n1;
 }
 
-static int qcow2_co_readv(BlockDriverState *bs, int64_t sector_num,
+static coroutine_fn int qcow2_co_readv(BlockDriverState *bs, int64_t sector_num,
                           int remaining_sectors, QEMUIOVector *qiov)
 {
     BDRVQcowState *s = bs->opaque;
@@ -516,7 +516,7 @@ static void run_dependent_requests(BDRVQcowState *s, QCowL2Meta *m)
     }
 }
 
-static int qcow2_co_writev(BlockDriverState *bs,
+static coroutine_fn int qcow2_co_writev(BlockDriverState *bs,
                            int64_t sector_num,
                            int remaining_sectors,
                            QEMUIOVector *qiov)
@@ -1105,7 +1105,7 @@ fail:
     return ret;
 }
 
-static int qcow2_co_flush(BlockDriverState *bs)
+static coroutine_fn int qcow2_co_flush(BlockDriverState *bs)
 {
     BDRVQcowState *s = bs->opaque;
     int ret;
diff --git a/block/sheepdog.c b/block/sheepdog.c
index 9f80609..c5bc520 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -1713,7 +1713,7 @@ out:
     return 1;
 }
 
-static int sd_co_writev(BlockDriverState *bs, int64_t sector_num,
+static coroutine_fn int sd_co_writev(BlockDriverState *bs, int64_t sector_num,
                         int nb_sectors, QEMUIOVector *qiov)
 {
     SheepdogAIOCB *acb;
@@ -1742,7 +1742,7 @@ static int sd_co_writev(BlockDriverState *bs, int64_t sector_num,
     return acb->ret;
 }
 
-static int sd_co_readv(BlockDriverState *bs, int64_t sector_num,
+static coroutine_fn int sd_co_readv(BlockDriverState *bs, int64_t sector_num,
                        int nb_sectors, QEMUIOVector *qiov)
 {
     SheepdogAIOCB *acb;
-- 
1.7.5.4

Re: [Qemu-devel] [Qemu-trivial] [PATCH] block:add coroutine_fn marker to coroutine functions

[Stefan Hajnoczi]

On Thu, Nov 10, 2011 at 04:23:22PM +0800, Dong Xu Wang wrote:
> From: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
> 
> Looks better when reviewing these source files.
> 
> Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
> ---
>  block/qcow.c     |    4 ++--
>  block/qcow2.c    |    6 +++---
>  block/sheepdog.c |    4 ++--
>  3 files changed, 7 insertions(+), 7 deletions(-)

Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>

Looks fine but please send all block patches through Kevin, who actively
maintains the block layer.

Stefan

Re: [Qemu-devel] [Qemu-trivial] [PATCH] block:add coroutine_fn marker to coroutine functions

[Dong Xu Wang]

2011/11/10 Stefan Hajnoczi <stefanha@gmail.com>:
> On Thu, Nov 10, 2011 at 04:23:22PM +0800, Dong Xu Wang wrote:
>> From: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
>>
>> Looks better when reviewing these source files.
>>
>> Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
>> ---
>>  block/qcow.c     |    4 ++--
>>  block/qcow2.c    |    6 +++---
>>  block/sheepdog.c |    4 ++--
>>  3 files changed, 7 insertions(+), 7 deletions(-)
>
> Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
>
> Looks fine but please send all block patches through Kevin, who actively
> maintains the block layer.
>
> Stefan
>
>
Okay. I will next time. :)

Re: [Qemu-devel] [PATCH] block:add coroutine_fn marker to coroutine functions

[Kevin Wolf]

Am 10.11.2011 09:23, schrieb Dong Xu Wang:
> From: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
> 
> Looks better when reviewing these source files.
> 
> Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>

Thanks, applied to the block branch (for 1.1)

Kevin