cryptospore / rpms / qemu-kvm

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