yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
ae23c9
From e52756f20cebe52713bd13672f1217d637e039f7 Mon Sep 17 00:00:00 2001
ae23c9
From: John Snow <jsnow@redhat.com>
ae23c9
Date: Wed, 18 Jul 2018 22:55:09 +0200
ae23c9
Subject: [PATCH 251/268] nbd/server: fix nbd_co_send_block_status
ae23c9
ae23c9
RH-Author: John Snow <jsnow@redhat.com>
ae23c9
Message-id: <20180718225511.14878-34-jsnow@redhat.com>
ae23c9
Patchwork-id: 81418
ae23c9
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 33/35] nbd/server: fix nbd_co_send_block_status
ae23c9
Bugzilla: 1207657
ae23c9
RH-Acked-by: Eric Blake <eblake@redhat.com>
ae23c9
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
ae23c9
RH-Acked-by: Fam Zheng <famz@redhat.com>
ae23c9
ae23c9
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
ae23c9
ae23c9
Call nbd_co_send_extents() with correct length parameter
ae23c9
(extent.length may be smaller than original length).
ae23c9
ae23c9
Also, switch length parameter type to uint32_t, to correspond with
ae23c9
request->len and similar nbd_co_send_bitmap().
ae23c9
ae23c9
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
ae23c9
Message-Id: <20180704112302.471456-2-vsementsov@virtuozzo.com>
ae23c9
Signed-off-by: Eric Blake <eblake@redhat.com>
ae23c9
(cherry picked from commit 0c0eaed14721f8a9db334deb35316411c512059a)
ae23c9
Signed-off-by: John Snow <jsnow@redhat.com>
ae23c9
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
ae23c9
---
ae23c9
 nbd/server.c | 5 +++--
ae23c9
 1 file changed, 3 insertions(+), 2 deletions(-)
ae23c9
ae23c9
diff --git a/nbd/server.c b/nbd/server.c
ae23c9
index e52b76b..ea5fe0e 100644
ae23c9
--- a/nbd/server.c
ae23c9
+++ b/nbd/server.c
ae23c9
@@ -1910,7 +1910,7 @@ static int nbd_co_send_extents(NBDClient *client, uint64_t handle,
ae23c9
 /* Get block status from the exported device and send it to the client */
ae23c9
 static int nbd_co_send_block_status(NBDClient *client, uint64_t handle,
ae23c9
                                     BlockDriverState *bs, uint64_t offset,
ae23c9
-                                    uint64_t length, bool last,
ae23c9
+                                    uint32_t length, bool last,
ae23c9
                                     uint32_t context_id, Error **errp)
ae23c9
 {
ae23c9
     int ret;
ae23c9
@@ -1922,7 +1922,8 @@ static int nbd_co_send_block_status(NBDClient *client, uint64_t handle,
ae23c9
                 client, handle, -ret, "can't get block status", errp);
ae23c9
     }
ae23c9
 
ae23c9
-    return nbd_co_send_extents(client, handle, &extent, 1, length, last,
ae23c9
+    return nbd_co_send_extents(client, handle, &extent, 1,
ae23c9
+                               be32_to_cpu(extent.length), last,
ae23c9
                                context_id, errp);
ae23c9
 }
ae23c9
 
ae23c9
-- 
ae23c9
1.8.3.1
ae23c9