[PULL 0/2] Block patches for 6.1-rc3

[PULL 0/2] Block patches for 6.1-rc3

[Hanna Reitz]

Hi Peter,

Let me prefix this by saying that it's me, Max.  I've changed my name
and email address.  I understand freeze may not be the best of times for
this, but it looks like I can no longer send mails from the mreitz@
address for now (only receive them).

I've tried to create and sign the tag as Max, so I hope this pull
request won't run into any issues from that perspective.

(For the future, I'll create a new key and hope signing it with my old
key will make it sufficiently trustworthy...)


The following changes since commit 632eda54043d6f26ff87dac16233e14b4708b967:

  Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging (2021-08-09 11:04:27 +0100)

are available in the Git repository at:

  https://github.com/XanClic/qemu.git tags/pull-block-2021-08-09

for you to fetch changes up to a6d2bb25cf945cd16f29a575055c6f1a1f9cf6c9:

  tests: filter out TLS distinguished name in certificate checks (2021-08-09 17:32:43 +0200)

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

----------------------------------------------------------------
Daniel P. Berrangé (1):
  tests: filter out TLS distinguished name in certificate checks

Fabrice Fontaine (1):
  block/export/fuse.c: fix musl build

 block/export/fuse.c              | 8 ++++++--
 tests/qemu-iotests/233           | 2 +-
 tests/qemu-iotests/233.out       | 4 ++--
 tests/qemu-iotests/common.filter | 5 +++++
 4 files changed, 14 insertions(+), 5 deletions(-)

-- 
2.31.1

[PULL 1/2] block/export/fuse.c: fix musl build

[Hanna Reitz]

From: Fabrice Fontaine <fontaine.fabrice@gmail.com>

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>
---
 block/export/fuse.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/block/export/fuse.c b/block/export/fuse.c
index ada9e263eb..fc7b07d2b5 100644
--- a/block/export/fuse.c
+++ b/block/export/fuse.c
@@ -635,7 +635,9 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t inode, int mode,
             offset += size;
             length -= size;
         } while (ret == 0 && length > 0);
-    } else if (mode & FALLOC_FL_ZERO_RANGE) {
+    }
+#ifdef CONFIG_FALLOCATE_ZERO_RANGE
+    else if (mode & FALLOC_FL_ZERO_RANGE) {
         if (!(mode & FALLOC_FL_KEEP_SIZE) && offset + length > blk_len) {
             /* No need for zeroes, we are going to write them ourselves */
             ret = fuse_do_truncate(exp, offset + length, false,
@@ -654,7 +656,9 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t inode, int mode,
             offset += size;
             length -= size;
         } while (ret == 0 && length > 0);
-    } else if (!mode) {
+    }
+#endif /* CONFIG_FALLOCATE_ZERO_RANGE */
+    else if (!mode) {
         /* We can only fallocate at the EOF with a truncate */
         if (offset < blk_len) {
             fuse_reply_err(req, EOPNOTSUPP);
-- 
2.31.1

[PULL 2/2] tests: filter out TLS distinguished name in certificate checks

[Hanna Reitz]

From: Daniel P. Berrangé <berrange@redhat.com>

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>
---
 tests/qemu-iotests/233           | 2 +-
 tests/qemu-iotests/233.out       | 4 ++--
 tests/qemu-iotests/common.filter | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/tests/qemu-iotests/233 b/tests/qemu-iotests/233
index da150cd27b..9ca7b68f42 100755
--- a/tests/qemu-iotests/233
+++ b/tests/qemu-iotests/233
@@ -148,7 +148,7 @@ $QEMU_IMG info --image-opts \
 
 echo
 echo "== final server log =="
-cat "$TEST_DIR/server.log"
+cat "$TEST_DIR/server.log" | _filter_authz_check_tls
 rm -f "$TEST_DIR/server.log"
 
 # success, all done
diff --git a/tests/qemu-iotests/233.out b/tests/qemu-iotests/233.out
index c3c344811b..4b1f6a0e15 100644
--- a/tests/qemu-iotests/233.out
+++ b/tests/qemu-iotests/233.out
@@ -65,6 +65,6 @@ qemu-img: Could not open 'driver=nbd,host=127.0.0.1,port=PORT,tls-creds=tls0': F
 == final server log ==
 qemu-nbd: option negotiation failed: Verify failed: No certificate was found.
 qemu-nbd: option negotiation failed: Verify failed: No certificate was found.
-qemu-nbd: option negotiation failed: TLS x509 authz check for CN=localhost,O=Cthulhu Dark Lord Enterprises client1,L=R'lyeh,C=South Pacific is denied
-qemu-nbd: option negotiation failed: TLS x509 authz check for CN=localhost,O=Cthulhu Dark Lord Enterprises client3,L=R'lyeh,C=South Pacific is denied
+qemu-nbd: option negotiation failed: TLS x509 authz check for DISTINGUISHED-NAME is denied
+qemu-nbd: option negotiation failed: TLS x509 authz check for DISTINGUISHED-NAME is denied
 *** done
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index 268b749e2f..2b2b53946c 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -332,5 +332,10 @@ for fname in fnames:
 sys.stdout.write(result)'
 }
 
+_filter_authz_check_tls()
+{
+    $SED -e 's/TLS x509 authz check for .* is denied/TLS x509 authz check for DISTINGUISHED-NAME is denied/'
+}
+
 # make sure this script returns success
 true
-- 
2.31.1

Re: [PULL 0/2] Block patches for 6.1-rc3

[Peter Maydell]

On Mon, 9 Aug 2021 at 18:03, Hanna Reitz <hreitz@redhat.com> wrote:
>
> Hi Peter,
>
> Let me prefix this by saying that it's me, Max.  I've changed my name
> and email address.  I understand freeze may not be the best of times for
> this, but it looks like I can no longer send mails from the mreitz@
> address for now (only receive them).
>
> I've tried to create and sign the tag as Max, so I hope this pull
> request won't run into any issues from that perspective.
>
> (For the future, I'll create a new key and hope signing it with my old
> key will make it sufficiently trustworthy...)

Yep, that's fine. This pullreq is going through OK (will send the
usual applied/errors email once the builds have completed). I'm happy
to treat signed-by-old-key as trusted enough. (In fact we already
are working basically on trust-on-first-use for new keys, but if
you're OK with signing your new key with the old one that does
simplify things a bit.)

Do you plan to send a patch to MAINTAINERS ? It has some
mreitz@redhat lines in it currently.

thanks
-- PMM

Re: [PULL 0/2] Block patches for 6.1-rc3

[Hanna Reitz]

On 09.08.21 20:43, Peter Maydell wrote:
> On Mon, 9 Aug 2021 at 18:03, Hanna Reitz <hreitz@redhat.com> wrote:
>> Hi Peter,
>>
>> Let me prefix this by saying that it's me, Max.  I've changed my name
>> and email address.  I understand freeze may not be the best of times for
>> this, but it looks like I can no longer send mails from the mreitz@
>> address for now (only receive them).
>>
>> I've tried to create and sign the tag as Max, so I hope this pull
>> request won't run into any issues from that perspective.
>>
>> (For the future, I'll create a new key and hope signing it with my old
>> key will make it sufficiently trustworthy...)
> Yep, that's fine. This pullreq is going through OK (will send the
> usual applied/errors email once the builds have completed). I'm happy
> to treat signed-by-old-key as trusted enough. (In fact we already
> are working basically on trust-on-first-use for new keys, but if
> you're OK with signing your new key with the old one that does
> simplify things a bit.)

Great!

> Do you plan to send a patch to MAINTAINERS ? It has some
> mreitz@redhat lines in it currently.

Yes, I do.

Hanna

Re: [PULL 0/2] Block patches for 6.1-rc3

[Peter Maydell]

On Mon, 9 Aug 2021 at 18:03, Hanna Reitz <hreitz@redhat.com> wrote:
>
> Hi Peter,
>
> Let me prefix this by saying that it's me, Max.  I've changed my name
> and email address.  I understand freeze may not be the best of times for
> this, but it looks like I can no longer send mails from the mreitz@
> address for now (only receive them).
>
> I've tried to create and sign the tag as Max, so I hope this pull
> request won't run into any issues from that perspective.
>
> (For the future, I'll create a new key and hope signing it with my old
> key will make it sufficiently trustworthy...)
>
>
> The following changes since commit 632eda54043d6f26ff87dac16233e14b4708b967:
>
>   Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging (2021-08-09 11:04:27 +0100)
>
> are available in the Git repository at:
>
>   https://github.com/XanClic/qemu.git tags/pull-block-2021-08-09
>
> for you to fetch changes up to a6d2bb25cf945cd16f29a575055c6f1a1f9cf6c9:
>
>   tests: filter out TLS distinguished name in certificate checks (2021-08-09 17:32:43 +0200)
>
> ----------------------------------------------------------------
> Block patches for 6.1-rc3:
> - Build fix for FUSE block exports
> - iotest 233 fix
>

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/6.1
for any user-visible changes.

-- PMM