Failed in applying to current master (
apply log)
Maintainers: Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Xie Yongji <xieyongji@bytedance.com>, "Michael S. Tsirkin" <mst@redhat.com>, Stefano Garzarella <sgarzare@redhat.com>, Coiby Xu <Coiby.Xu@gmail.com>, Peter Lieven <pl@dlhnet.de>, Pierrick Bouvier <pierrick.bouvier@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Eric Blake <eblake@redhat.com>, Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>, Markus Armbruster <armbru@redhat.com>
qapi/block-core.json | 21 +-
qapi/block-export.json | 41 +-
docs/system/device-url-syntax.rst.inc | 6 +
include/block/export.h | 12 +-
include/qemu/osdep.h | 1 +
block/curl.c | 104 +-
block/export/export.c | 48 +-
block/export/fuse.c | 1311 +++++++++++++++++++------
block/export/vduse-blk.c | 7 +
block/export/vhost-user-blk-server.c | 8 +
block/file-posix.c | 17 +-
block/nfs.c | 50 +-
nbd/server.c | 6 +
util/osdep.c | 18 +
block/trace-events | 1 +
meson.build | 2 +-
tests/qemu-iotests/307 | 47 +
tests/qemu-iotests/307.out | 18 +
tests/qemu-iotests/308 | 95 +-
tests/qemu-iotests/308.out | 71 +-
tests/qemu-iotests/tests/fuse-allow-other | 3 +-
tests/qemu-iotests/tests/fuse-allow-other.out | 9 +-
22 files changed, 1506 insertions(+), 390 deletions(-)