From f6f47020d06eca20a99967b6ac9eef65326dfdde Mon Sep 17 00:00:00 2001

From: Orit Wasserman <owasserm@redhat.com>

Date: Wed, 9 Oct 2013 10:09:06 +0200

Subject: [PATCH 11/25] block: add bdrv_write_zeroes()

RH-Author: Orit Wasserman <owasserm@redhat.com>

Message-id: <1381313355-15641-2-git-send-email-owasserm@redhat.com>

Patchwork-id: 54797

O-Subject: [RHEL7.0 qemu-kvm v2 01/10] block: add bdrv_write_zeroes()

Bugzilla: 921465

RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

RH-Acked-by: Juan Quintela <quintela@redhat.com>

From: Peter Lieven <pl@kamp.de>

Signed-off-by: Peter Lieven <pl@kamp.de>

Reviewed-by: Kevin Wolf <kwolf@redhat.com>

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

(cherry picked from commit 4105eaaab9376ea959de711b81bba9e1494c971d)

---

 block.c               | 27 +++++++++++++++++++--------

 include/block/block.h |  2 ++

 2 files changed, 21 insertions(+), 8 deletions(-)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 block.c               |   27 +++++++++++++++++++--------

 include/block/block.h |    2 ++

 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/block.c b/block.c

index bd52c13..b160f62 100644

--- a/block.c

+++ b/block.c

@@ -2190,6 +2190,7 @@ typedef struct RwCo {

     QEMUIOVector *qiov;

     bool is_write;

     int ret;

+    BdrvRequestFlags flags;

 } RwCo;

 static void coroutine_fn bdrv_rw_co_entry(void *opaque)

@@ -2198,10 +2199,12 @@ static void coroutine_fn bdrv_rw_co_entry(void *opaque)

     if (!rwco->is_write) {

         rwco->ret = bdrv_co_do_readv(rwco->bs, rwco->sector_num,

-                                     rwco->nb_sectors, rwco->qiov, 0);

+                                     rwco->nb_sectors, rwco->qiov,

+                                     rwco->flags);

     } else {

         rwco->ret = bdrv_co_do_writev(rwco->bs, rwco->sector_num,

-                                      rwco->nb_sectors, rwco->qiov, 0);

+                                      rwco->nb_sectors, rwco->qiov,

+                                      rwco->flags);

     }

 }

@@ -2209,7 +2212,8 @@ static void coroutine_fn bdrv_rw_co_entry(void *opaque)

  * Process a vectored synchronous request using coroutines

  */

 static int bdrv_rwv_co(BlockDriverState *bs, int64_t sector_num,

-                       QEMUIOVector *qiov, bool is_write)

+                       QEMUIOVector *qiov, bool is_write,

+                       BdrvRequestFlags flags)

 {

     Coroutine *co;

     RwCo rwco = {

@@ -2219,6 +2223,7 @@ static int bdrv_rwv_co(BlockDriverState *bs, int64_t sector_num,

         .qiov = qiov,

         .is_write = is_write,

         .ret = NOT_DONE,

+        .flags = flags,

     };

     assert((qiov->size & (BDRV_SECTOR_SIZE - 1)) == 0);

@@ -2250,7 +2255,7 @@ static int bdrv_rwv_co(BlockDriverState *bs, int64_t sector_num,

  * Process a synchronous request using coroutines

  */

 static int bdrv_rw_co(BlockDriverState *bs, int64_t sector_num, uint8_t *buf,

-                      int nb_sectors, bool is_write)

+                      int nb_sectors, bool is_write, BdrvRequestFlags flags)

 {

     QEMUIOVector qiov;

     struct iovec iov = {

@@ -2259,14 +2264,14 @@ static int bdrv_rw_co(BlockDriverState *bs, int64_t sector_num, uint8_t *buf,

     };

     qemu_iovec_init_external(&qiov, &iov, 1);

-    return bdrv_rwv_co(bs, sector_num, &qiov, is_write);

+    return bdrv_rwv_co(bs, sector_num, &qiov, is_write, flags);

 }

 /* return < 0 if error. See bdrv_write() for the return codes */

 int bdrv_read(BlockDriverState *bs, int64_t sector_num,

               uint8_t *buf, int nb_sectors)

 {

-    return bdrv_rw_co(bs, sector_num, buf, nb_sectors, false);

+    return bdrv_rw_co(bs, sector_num, buf, nb_sectors, false, 0);

 }

 /* Just like bdrv_read(), but with I/O throttling temporarily disabled */

@@ -2292,12 +2297,18 @@ int bdrv_read_unthrottled(BlockDriverState *bs, int64_t sector_num,

 int bdrv_write(BlockDriverState *bs, int64_t sector_num,

                const uint8_t *buf, int nb_sectors)

 {

-    return bdrv_rw_co(bs, sector_num, (uint8_t *)buf, nb_sectors, true);

+    return bdrv_rw_co(bs, sector_num, (uint8_t *)buf, nb_sectors, true, 0);

 }

 int bdrv_writev(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov)

 {

-    return bdrv_rwv_co(bs, sector_num, qiov, true);

+    return bdrv_rwv_co(bs, sector_num, qiov, true, 0);

+}

+

+int bdrv_write_zeroes(BlockDriverState *bs, int64_t sector_num, int nb_sectors)

+{

+    return bdrv_rw_co(bs, sector_num, NULL, nb_sectors, true,

+                      BDRV_REQ_ZERO_WRITE);

 }

 int bdrv_pread(BlockDriverState *bs, int64_t offset,

diff --git a/include/block/block.h b/include/block/block.h

index 174295b..1a3ed22 100644

--- a/include/block/block.h

+++ b/include/block/block.h

@@ -168,6 +168,8 @@ int bdrv_read_unthrottled(BlockDriverState *bs, int64_t sector_num,

                           uint8_t *buf, int nb_sectors);

 int bdrv_write(BlockDriverState *bs, int64_t sector_num,

                const uint8_t *buf, int nb_sectors);

+int bdrv_write_zeroes(BlockDriverState *bs, int64_t sector_num,

+               int nb_sectors);

 int bdrv_writev(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov);

 int bdrv_pread(BlockDriverState *bs, int64_t offset,

                void *buf, int count);

-- 

1.7.1