mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 01:43:39 +00:00
Block patches for 6.1-rc3:
- Build fix for FUSE block exports - iotest 233 fix -----BEGIN PGP SIGNATURE----- iQFGBAABCAAwFiEEkb62CjDbPohX0Rgp9AfbAGHVz0AFAmERXvESHG1yZWl0ekBy ZWRoYXQuY29tAAoJEPQH2wBh1c9AgTkIALLjvAWWvcZc4JaGV4Wo6ZQZ7zfOXnYc jK/NhBLrKj1FPB0j00gAzTDlNcZB/39NImHtXjdI2sOvqIsG87efqrBheTOJ43+9 tAB4efsQ1+HDHEtGoKd3ydYinJojradWzQQeoTVvsPSPsouUlEe8ZBIThe7SWy+9 kmqZjIgaFkGaML/citMYg4FWDjm3IYt0K4BliIg3ySiJSCGEm6xIIe91PbaRru// zrBw+sIf0ax0fXSlOemUwm+gwQ4jHE7n9cnnRSK8crawwfdyqmfjjfiPDfCs5sFw Nr+qtwPmvLVpkbdsF9G9cB3MIO6Rb59aAIcLSpMouI1cQpGFMhZUOrE= =Ew2C -----END PGP SIGNATURE----- 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>
This commit is contained in:
commit
e0d24696b9
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue