[Qemu-commits] [qemu/qemu] c4e2af: qemu-nbd: Look up flag names in array

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: c4e2aff81bef7310a4139707f8f880dbd2bab6b4
      
https://github.com/qemu/qemu/commit/c4e2aff81bef7310a4139707f8f880dbd2bab6b4
  Author: Max Reitz <address@hidden>
  Date:   2019-05-07 (Tue, 07 May 2019)

  Changed paths:
    M include/block/nbd.h
    M qemu-nbd.c

  Log Message:
  -----------
  qemu-nbd: Look up flag names in array

The existing code to convert flag bits into strings looks a bit strange
now, and if we ever add more flags, it will look even stranger.  Prevent
that from happening by making it look up the flag names in an array.

Signed-off-by: Max Reitz <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: 876df72d759c854d2ed84cd415bcd309c4e46978
      
https://github.com/qemu/qemu/commit/876df72d759c854d2ed84cd415bcd309c4e46978
  Author: Max Reitz <address@hidden>
  Date:   2019-05-07 (Tue, 07 May 2019)

  Changed paths:
    M tests/qemu-iotests/233
    M tests/qemu-iotests/233.out

  Log Message:
  -----------
  iotests: Fix 233 for ports other than 10809

233 generally filters the port, but in two cases does not.  If some
other concurrently running application has already taken port 10809,
this will result in an output mismatch.  Fix this by applying the
filter in these two cases, too.

Signed-off-by: Max Reitz <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: e74ee02c1e97c7b533afed3a65019cbb6742bb31
      
https://github.com/qemu/qemu/commit/e74ee02c1e97c7b533afed3a65019cbb6742bb31
  Author: Thomas Huth <address@hidden>
  Date:   2019-05-07 (Tue, 07 May 2019)

  Changed paths:
    M tests/qemu-iotests/059.out
    M tests/qemu-iotests/083.out
    M tests/qemu-iotests/092.out

  Log Message:
  -----------
  tests/qemu-iotests: Fix more reference output files due to recent qemu-io 
change

The output of qemu-io changed recently - most tests have been fixed in
commit 36b9986b08787019ef42 ("tests/qemu-iotests: Fix output of qemu-io
related tests") already, but a qcow1, vmdk, and nbd test were still missing.

Fixes: 99e98d7c9fc1a1639fad ("qemu-io: Use error_[gs]et_progname()")
Signed-off-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
[eblake: squash in NBD 083 fixes]
Reviewed-by: Stefano Garzarella <address@hidden>
Tested-by: Stefano Garzarella <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: d3192de752cd6d383d38e50341b39d9550d21fa8
      
https://github.com/qemu/qemu/commit/d3192de752cd6d383d38e50341b39d9550d21fa8
  Author: Eric Blake <address@hidden>
  Date:   2019-05-07 (Tue, 07 May 2019)

  Changed paths:
    M tests/qemu-iotests/221
    M tests/qemu-iotests/221.out

  Log Message:
  -----------
  iotests: Tweak 221 sizing for different hole granularities

For some particular configurations of ext4, sizing an image to 84
sectors + 1 byte causes test failures when the size of the hole is
rounded to a 4k alignment. Let's instead size things to 128 sectors +
1 byte, as the 64k boundary is more likely to work with various hole
granularities.

Reported-by: Thomas Huth <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Tested-by: Thomas Huth <address@hidden>


  Commit: 8fabb8be37775ebb32b0d78bc7be815a29b8a107
      
https://github.com/qemu/qemu/commit/8fabb8be37775ebb32b0d78bc7be815a29b8a107
  Author: Max Reitz <address@hidden>
  Date:   2019-05-07 (Tue, 07 May 2019)

  Changed paths:
    M tests/qemu-iotests/182
    M tests/qemu-iotests/182.out

  Log Message:
  -----------
  iotests: Make 182 do without device_add

182 fails if qemu has no support for hotplugging of a virtio-blk device.
Using an NBD server instead works just as well for the test, even on
qemus without hotplugging support.

Fixes: 6d0a4a0fb5c8f10c8eb68b52cfda0082b00ae963
Reported-by: Danilo C. L. de Paula <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
Message-Id: <address@hidden>
Tested-by: Eric Blake <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Acked-by: Alberto Garcia <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: df06df4f412a67341de0fbb075e74c4dde3c8972
      
https://github.com/qemu/qemu/commit/df06df4f412a67341de0fbb075e74c4dde3c8972
  Author: Peter Maydell <address@hidden>
  Date:   2019-05-08 (Wed, 08 May 2019)

  Changed paths:
    M include/block/nbd.h
    M qemu-nbd.c
    M tests/qemu-iotests/059.out
    M tests/qemu-iotests/083.out
    M tests/qemu-iotests/092.out
    M tests/qemu-iotests/182
    M tests/qemu-iotests/182.out
    M tests/qemu-iotests/221
    M tests/qemu-iotests/221.out
    M tests/qemu-iotests/233
    M tests/qemu-iotests/233.out

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

nbd patches for 2019-05-07

- iotest improvements

# gpg: Signature made Tue 07 May 2019 16:00:18 BST
# gpg:                using RSA key A7A16B4A2527436A
# 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-2019-05-07:
  iotests: Make 182 do without device_add
  iotests: Tweak 221 sizing for different hole granularities
  tests/qemu-iotests: Fix more reference output files due to recent qemu-io 
change
  iotests: Fix 233 for ports other than 10809
  qemu-nbd: Look up flag names in array

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


Compare: https://github.com/qemu/qemu/compare/629d16699472...df06df4f412a