[Qemu-commits] [qemu/qemu] 474a6e: tools: Fix use of fcntl(F_SETFD) during socket act...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 474a6e64f2c3c17718b853b9d70e054ee8d26f37
      
https://github.com/qemu/qemu/commit/474a6e64f2c3c17718b853b9d70e054ee8d26f37
  Author: Eric Blake <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M util/systemd.c

  Log Message:
  -----------
  tools: Fix use of fcntl(F_SETFD) during socket activation

Blindly setting FD_CLOEXEC without a read-modify-write will
inadvertently clear any other intentionally-set bits, such as a
proposed new bit for designating a fd that must behave in 32-bit mode.
However, we cannot use our wrapper qemu_set_cloexec(), because that
wrapper intentionally abort()s on failure, whereas the probe here
intentionally tolerates failure to deal with incorrect socket
activation gracefully.  Instead, fix the code to do the proper
read-modify-write.

Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>


  Commit: e5ac52d8d405f46843465128410a8f1362458eb6
      
https://github.com/qemu/qemu/commit/e5ac52d8d405f46843465128410a8f1362458eb6
  Author: Max Reitz <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M tests/qemu-iotests/041

  Log Message:
  -----------
  iotests/041: Fix NBD socket path

We should put all UNIX socket files into the sock_dir, not test_dir.

Reported-by: Elena Ufimtseva <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Fixes: a1da1878607a
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: 6bf792b4643bd88153b2d473f735f93638cac521
      
https://github.com/qemu/qemu/commit/6bf792b4643bd88153b2d473f735f93638cac521
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M block/nbd.c

  Log Message:
  -----------
  block/nbd-client: drop max_block restriction from block_status

The NBD spec was updated (see nbd.git commit 9f30fedb) so that
max_block doesn't relate to NBD_CMD_BLOCK_STATUS. So, drop the
restriction.

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
[eblake: tweak commit message to call out NBD commit]
Signed-off-by: Eric Blake <address@hidden>


  Commit: 714eb0dbc5480c8a9d9f39eb931cb5d2acc1b6c6
      
https://github.com/qemu/qemu/commit/714eb0dbc5480c8a9d9f39eb931cb5d2acc1b6c6
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M block/nbd.c

  Log Message:
  -----------
  block/nbd-client: drop max_block restriction from discard

The NBD spec was updated (see nbd.git commit 9f30fedb) so that
max_block doesn't relate to NBD_CMD_TRIM. So, drop the restriction.

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
[eblake: tweak commit message to call out NBD commit]
Signed-off-by: Eric Blake <address@hidden>


  Commit: f19d118bed77bb95681b07f4e76dbb700c16918d
      
https://github.com/qemu/qemu/commit/f19d118bed77bb95681b07f4e76dbb700c16918d
  Author: Peter Maydell <address@hidden>
  Date:   2020-05-05 (Tue, 05 May 2020)

  Changed paths:
    M block/nbd.c
    M tests/qemu-iotests/041
    M util/systemd.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2020-05-04' into 
staging

nbd patches for 2020-05-04

- reduce client-side fragmentation of NBD trim and status requests
- fix iotest 41 when run in deep tree
- fix socket activation in qemu-nbd

# gpg: Signature made Mon 04 May 2020 22:12:21 BST
# gpg:                using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A
# gpg: Good signature from "Eric Blake <address@hidden>" [full]
# gpg:                 aka "Eric Blake (Free Software Programmer) 
<address@hidden>" [full]
# gpg:                 aka "[jpeg image of size 6874]" [full]
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-nbd-2020-05-04:
  block/nbd-client: drop max_block restriction from discard
  block/nbd-client: drop max_block restriction from block_status
  iotests/041: Fix NBD socket path
  tools: Fix use of fcntl(F_SETFD) during socket activation

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


Compare: https://github.com/qemu/qemu/compare/a2261b2754c9...f19d118bed77