[Qemu-commits] [qemu/qemu] 50482f: block/export/fuse.c: fix musl build

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 50482fda98bd62e072c30b7ea73c985c4e9d9bbb
      
https://github.com/qemu/qemu/commit/50482fda98bd62e072c30b7ea73c985c4e9d9bbb
  Author: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  Date:   2021-08-09 (Mon, 09 Aug 2021)

  Changed paths:
    M block/export/fuse.c

  Log Message:
  -----------
  block/export/fuse.c: fix musl build

Fix the following build failure on musl raised since version 6.0.0 and
https://gitlab.com/qemu-project/qemu/-/commit/4ca37a96a75aafe7a37ba51ab1912b09b7190a6b
because musl does not define FALLOC_FL_ZERO_RANGE:

../block/export/fuse.c: In function 'fuse_fallocate':
../block/export/fuse.c:563:23: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first 
use in this function)
  563 |     } else if (mode & FALLOC_FL_ZERO_RANGE) {
      |                       ^~~~~~~~~~~~~~~~~~~~

Fixes:
 - 
http://autobuild.buildroot.org/results/b96e3d364fd1f8bbfb18904a742e73327d308f64

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Message-Id: <20210809095101.1101336-1-fontaine.fabrice@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>


  Commit: a6d2bb25cf945cd16f29a575055c6f1a1f9cf6c9
      
https://github.com/qemu/qemu/commit/a6d2bb25cf945cd16f29a575055c6f1a1f9cf6c9
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   2021-08-09 (Mon, 09 Aug 2021)

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

  Log Message:
  -----------
  tests: filter out TLS distinguished name in certificate checks

The version of GNUTLS in Fedora 34 has changed the order in which encodes
fields when generating new TLS certificates. This in turn changes the
order seen when querying the distinguished name. This ultimately breaks
the expected output in the NBD TLS iotests. We don't need to be
comparing the exact distinguished name text for the purpose of the test
though, so it is fine to filter it out.

Reported-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20210804180330.3469683-1-berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Tested-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>


  Commit: e0d24696b9d9d78d621e3dedfcb3d2c094bdd8a3
      
https://github.com/qemu/qemu/commit/e0d24696b9d9d78d621e3dedfcb3d2c094bdd8a3
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-08-09 (Mon, 09 Aug 2021)

  Changed paths:
    M block/export/fuse.c
    M tests/qemu-iotests/233
    M tests/qemu-iotests/233.out
    M tests/qemu-iotests/common.filter

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/hreitz/tags/pull-block-2021-08-09' into 
staging

Block patches for 6.1-rc3:
- Build fix for FUSE block exports
- iotest 233 fix

# gpg: Signature made Mon 09 Aug 2021 17:59:29 BST
# gpg:                using RSA key 91BEB60A30DB3E8857D11829F407DB0061D5CF40
# gpg:                issuer "mreitz@redhat.com"
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>" [full]
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1  1829 F407 DB00 61D5 CF40

* remotes/hreitz/tags/pull-block-2021-08-09:
  tests: filter out TLS distinguished name in certificate checks
  block/export/fuse.c: fix musl build

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/370ea52f725a...e0d24696b9d9