mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nbd patches for 2018-07-07

Browse Source 
Minor improvement for tracing of NBD block status
 
 - Vladimir Sementsov-Ogievskiy: nbd/server: fix nbd_co_send_block_status
 -----BEGIN PGP SIGNATURE-----
 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg
 
 iQEcBAABCAAGBQJbQWyuAAoJEKeha0olJ0NqLz4H/0eaN5zRrbBR0taSgx0a/TL8
 ljZQGDQOef/NYXpPG/I96TwOCJ0JQVsPLexDeSr8QPlL20+kDAQfLce8JzE6y6Jq
 0LZMulUHq0Vzyzd0LkQsX13ywoQvN8oiSTPFx3mHeoZcUT7/8dfRQH5KBeXrK9Ft
 d5soehzsJRqnGsAGMrmTVSlRG4uq/0yv4p4Fgr4InazD7QCDRKuQxqGnzdhUOYb8
 R/X1YzhLEmvheYUZHN92k52xPi7zB4xL51hUghUwWZjJSfjOO96VNxLcxshG+kfB
 TpJXcYG3vNcwtlcf32gx0+9vniJMvBAoQK9u6QCwWlGoYed3W6q1oLJ6JnZMUQQ=
 =AUfu
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2018-07-07' into staging

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

# gpg: Signature made Sun 08 Jul 2018 02:45:18 BST
# gpg:                using RSA key A7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>"
# gpg:                 aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>"
# gpg:                 aka "[jpeg image of size 6874]"
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-nbd-2018-07-07:
  nbd/server: fix nbd_co_send_block_status

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2018-07-09 09:48:01 +01:00
commit ab3257c281
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nbd/server.c
View File

@ -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);
}