[Qemu-commits] [qemu/qemu] cfa3ad: nbd-client: Use correct macro parenthesization

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: cfa3ad635c6d12f98049a7598e23305d233a4d73
      
https://github.com/qemu/qemu/commit/cfa3ad635c6d12f98049a7598e23305d233a4d73
  Author: Eric Blake <address@hidden>
  Date:   2017-09-25 (Mon, 25 Sep 2017)

  Changed paths:
    M block/nbd-client.c

  Log Message:
  -----------
  nbd-client: Use correct macro parenthesization

If 'bs' is a complex expression, we were only casting the front half
rather than the full expression.  Luckily, none of the callers were
passing bad arguments, but it's better to be robust up front.

Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>


  Commit: 319a56cde7313ca42a72e0a145ffa8e7832ada86
      
https://github.com/qemu/qemu/commit/319a56cde7313ca42a72e0a145ffa8e7832ada86
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2017-09-25 (Mon, 25 Sep 2017)

  Changed paths:
    M block/nbd-client.c

  Log Message:
  -----------
  block/nbd-client: refactor nbd_co_receive_reply

"NBDReply *reply" parameter of nbd_co_receive_reply is used only
to pass return value for nbd_co_request (reply.error). Remove it
and use function return value instead.

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: 93970672210ca1ee45fdebbc11e1fd97916c7c8e
      
https://github.com/qemu/qemu/commit/93970672210ca1ee45fdebbc11e1fd97916c7c8e
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2017-09-25 (Mon, 25 Sep 2017)

  Changed paths:
    M block/nbd-client.c

  Log Message:
  -----------
  block/nbd-client: simplify check in nbd_co_receive_reply

If we are woken up from while() loop in nbd_read_reply_entry
handles must be equal. If we are woken up from
nbd_recv_coroutines_wake_all s->quit must be true, so we do
not need checking handles equality.

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: a693437037328a95d815ad5aec37ac2f8e130e58
      
https://github.com/qemu/qemu/commit/a693437037328a95d815ad5aec37ac2f8e130e58
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2017-09-25 (Mon, 25 Sep 2017)

  Changed paths:
    M block/nbd-client.c

  Log Message:
  -----------
  block/nbd-client: nbd_co_send_request: fix return code

It's incorrect to return success rc >= 0 if we skip qio_channel_writev_all()
call due to s->quit.

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: 2b521a654cbe6ac602696e20db0ff4e65b61b670
      
https://github.com/qemu/qemu/commit/2b521a654cbe6ac602696e20db0ff4e65b61b670
  Author: Peter Maydell <address@hidden>
  Date:   2017-09-26 (Tue, 26 Sep 2017)

  Changed paths:
    M block/nbd-client.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2017-09-25' into 
staging

nbd patches for 2017-09-25

- Eric Blake: nbd-client: Use correct macro parenthesization
- Vladimir Sementsov-Ogievskiy: 0/3 nbd client refactoring and fixing

# gpg: Signature made Mon 25 Sep 2017 14:39:21 BST
# gpg:                using RSA key 0xA7A16B4A2527436A
# gpg: Good signature from "Eric Blake <address@hidden>"
# gpg:                 aka "Eric Blake (Free Software Programmer) 
<address@hidden>"
# 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-2017-09-25:
  block/nbd-client: nbd_co_send_request: fix return code
  block/nbd-client: simplify check in nbd_co_receive_reply
  block/nbd-client: refactor nbd_co_receive_reply
  nbd-client: Use correct macro parenthesization

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/1e3ee8340832...2b521a654cbe