[Qemu-devel] [PULL 0/1] NBD patches for 3.0

[Qemu-devel] [PULL 0/1] NBD patches for 3.0

[Eric Blake]

The following changes since commit 43a473993fd9378bf850dcafa68eb6dee8c300f8:

  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2018-07-06 18:18:08 +0100)

are available in the Git repository at:

  git://repo.or.cz/qemu/ericb.git tags/pull-nbd-2018-07-07

for you to fetch changes up to 0c0eaed14721f8a9db334deb35316411c512059a:

  nbd/server: fix nbd_co_send_block_status (2018-07-07 20:30:09 -0500)

Not much since my last pull request, but since I will be offline until
after rc1, I thought I'd get this one in now.

----------------------------------------------------------------
nbd patches for 2018-07-07

Minor improvement for tracing of NBD block status

- Vladimir Sementsov-Ogievskiy: nbd/server: fix nbd_co_send_block_status

----------------------------------------------------------------
Vladimir Sementsov-Ogievskiy (1):
      nbd/server: fix nbd_co_send_block_status

 nbd/server.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

-- 
2.14.4

[Qemu-devel] [PULL 1/1] nbd/server: fix nbd_co_send_block_status

[Eric Blake]

From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Call nbd_co_send_extents() with correct length parameter
(extent.length may be smaller than original length).

Also, switch length parameter type to uint32_t, to correspond with
request->len and similar nbd_co_send_bitmap().

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20180704112302.471456-2-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
 nbd/server.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nbd/server.c b/nbd/server.c
index e52b76bd1a4..ea5fe0eb336 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -1910,7 +1910,7 @@ static int nbd_co_send_extents(NBDClient *client, uint64_t handle,
 /* Get block status from the exported device and send it to the client */
 static int nbd_co_send_block_status(NBDClient *client, uint64_t handle,
                                     BlockDriverState *bs, uint64_t offset,
-                                    uint64_t length, bool last,
+                                    uint32_t length, bool last,
                                     uint32_t context_id, Error **errp)
 {
     int ret;
@@ -1922,7 +1922,8 @@ static int nbd_co_send_block_status(NBDClient *client, uint64_t handle,
                 client, handle, -ret, "can't get block status", errp);
     }

-    return nbd_co_send_extents(client, handle, &extent, 1, length, last,
+    return nbd_co_send_extents(client, handle, &extent, 1,
+                               be32_to_cpu(extent.length), last,
                                context_id, errp);
 }

-- 
2.14.4

Re: [Qemu-devel] [PULL 0/1] NBD patches for 3.0

[Peter Maydell]

On 8 July 2018 at 02:55, Eric Blake <eblake@redhat.com> wrote:
> The following changes since commit 43a473993fd9378bf850dcafa68eb6dee8c300f8:
>
>   Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2018-07-06 18:18:08 +0100)
>
> are available in the Git repository at:
>
>   git://repo.or.cz/qemu/ericb.git tags/pull-nbd-2018-07-07
>
> for you to fetch changes up to 0c0eaed14721f8a9db334deb35316411c512059a:
>
>   nbd/server: fix nbd_co_send_block_status (2018-07-07 20:30:09 -0500)
>
> Not much since my last pull request, but since I will be offline until
> after rc1, I thought I'd get this one in now.
>
> ----------------------------------------------------------------
> nbd patches for 2018-07-07
>
> Minor improvement for tracing of NBD block status
>
> - Vladimir Sementsov-Ogievskiy: nbd/server: fix nbd_co_send_block_status
>
> ----------------------------------------------------------------
> Vladimir Sementsov-Ogievskiy (1):
>       nbd/server: fix nbd_co_send_block_status
>
>  nbd/server.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
Applied, thanks.

-- PMM