yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
0a122b
From f1f339c365d7e68790ba8f84d0e16daac462d627 Mon Sep 17 00:00:00 2001
0a122b
From: Kevin Wolf <kwolf@redhat.com>
0a122b
Date: Tue, 3 Dec 2013 14:40:18 +0100
0a122b
Subject: [PATCH 15/37] block: Introduce bdrv_co_do_pwritev()
0a122b
0a122b
Message-id: <1392117622-28812-16-git-send-email-kwolf@redhat.com>
0a122b
Patchwork-id: 57180
0a122b
O-Subject: [RHEL-7.0 qemu-kvm PATCH v2 15/37] block: Introduce bdrv_co_do_pwritev()
0a122b
Bugzilla: 748906
0a122b
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
0a122b
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
0a122b
RH-Acked-by: Max Reitz <mreitz@redhat.com>
0a122b
0a122b
This is going to become the bdrv_co_do_preadv() equivalent for writes.
0a122b
In this patch, however, just a function taking byte offsets is created,
0a122b
it doesn't align anything yet.
0a122b
0a122b
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
0a122b
Reviewed-by: Max Reitz <mreitz@redhat.com>
0a122b
Reviewed-by: Benoit Canet <benoit@irqsave.net>
0a122b
(cherry picked from commit 6601553e27091ffe240bea69227adce941fe12e8)
0a122b
0a122b
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
0a122b
---
0a122b
 block.c | 24 ++++++++++++++++++------
0a122b
 1 file changed, 18 insertions(+), 6 deletions(-)
0a122b
---
0a122b
 block.c |   24 ++++++++++++++++++------
0a122b
 1 files changed, 18 insertions(+), 6 deletions(-)
0a122b
0a122b
diff --git a/block.c b/block.c
0a122b
index d8168f5..7b8131c 100644
0a122b
--- a/block.c
0a122b
+++ b/block.c
0a122b
@@ -3032,8 +3032,8 @@ static int coroutine_fn bdrv_aligned_pwritev(BlockDriverState *bs,
0a122b
 /*
0a122b
  * Handle a write request in coroutine context
0a122b
  */
0a122b
-static int coroutine_fn bdrv_co_do_writev(BlockDriverState *bs,
0a122b
-    int64_t sector_num, int nb_sectors, QEMUIOVector *qiov,
0a122b
+static int coroutine_fn bdrv_co_do_pwritev(BlockDriverState *bs,
0a122b
+    int64_t offset, unsigned int bytes, QEMUIOVector *qiov,
0a122b
     BdrvRequestFlags flags)
0a122b
 {
0a122b
     int ret;
0a122b
@@ -3044,21 +3044,33 @@ static int coroutine_fn bdrv_co_do_writev(BlockDriverState *bs,
0a122b
     if (bs->read_only) {
0a122b
         return -EACCES;
0a122b
     }
0a122b
-    if (bdrv_check_request(bs, sector_num, nb_sectors)) {
0a122b
+    if (bdrv_check_byte_request(bs, offset, bytes)) {
0a122b
         return -EIO;
0a122b
     }
0a122b
 
0a122b
     /* throttling disk I/O */
0a122b
     if (bs->io_limits_enabled) {
0a122b
-        bdrv_io_limits_intercept(bs, true, nb_sectors);
0a122b
+        /* TODO Switch to byte granularity */
0a122b
+        bdrv_io_limits_intercept(bs, true, bytes >> BDRV_SECTOR_BITS);
0a122b
     }
0a122b
 
0a122b
-    ret = bdrv_aligned_pwritev(bs, sector_num << BDRV_SECTOR_BITS,
0a122b
-                               nb_sectors << BDRV_SECTOR_BITS, qiov, flags);
0a122b
+    ret = bdrv_aligned_pwritev(bs, offset, bytes, qiov, flags);
0a122b
 
0a122b
     return ret;
0a122b
 }
0a122b
 
0a122b
+static int coroutine_fn bdrv_co_do_writev(BlockDriverState *bs,
0a122b
+    int64_t sector_num, int nb_sectors, QEMUIOVector *qiov,
0a122b
+    BdrvRequestFlags flags)
0a122b
+{
0a122b
+    if (nb_sectors < 0 || nb_sectors > (INT_MAX >> BDRV_SECTOR_BITS)) {
0a122b
+        return -EINVAL;
0a122b
+    }
0a122b
+
0a122b
+    return bdrv_co_do_pwritev(bs, sector_num << BDRV_SECTOR_BITS,
0a122b
+                              nb_sectors << BDRV_SECTOR_BITS, qiov, flags);
0a122b
+}
0a122b
+
0a122b
 int coroutine_fn bdrv_co_writev(BlockDriverState *bs, int64_t sector_num,
0a122b
     int nb_sectors, QEMUIOVector *qiov)
0a122b
 {
0a122b
-- 
0a122b
1.7.1
0a122b