On Thu, Sep 24, 2020 at 04:15:36PM +0100, Stefan Hajnoczi wrote:
> v2:
> * Replace unix-socket=str with addr=SocketAddress for consistency with NBD and
> fd passing support. The new syntax is:
> --export vhost-user-blk,addr.type=unix,addr.path=/tmp/vhost-user-blk.sock,...
> * Make addr=SocketAddress mandatory instead of optional [Markus]
> * Update test-vhost-user-blk.c to use new syntax
> * Add patch moving vhost-user-server.h to include/
> * Add patch to use libvhost-user.a instead of compiling it multiple times
>
> This patch series converts Coiby Xu's vhost-user-blk-server from a QOM object
> to the block exports API. The block exports API provides a standard QMP and
> command-line interface for managing block exports (NBD, FUSE, vhost-user-blk,
> etc). A fair amount of init/shutdown code is removed because the block exports
> API already takes care of that functionality.
>
> Most of the patches are vhost-user-blk-server cleanups.
>
> The syntax for launching qemu-storage-daemon is:
>
> $ qemu-storage-daemon \
> --blockdev file,node-name=drive0,filename=test.img \
> --export vhost-user-blk,node-name=drive0,id=export0,writable=on,addr.type=unix,addr.path=/tmp/vhost-user-blk.sock
>
> QEMU can connect to the vhost-user-blk export like this:
>
> $ qemu-system-x86_64 \
> -M accel=kvm,memory-backend=mem \
> -m 1G \
> -object memory-backend-memfd,size=1G,id=mem \
> -cpu host \
> -chardev socket,path=/tmp/vhost-user-blk.sock,id=char0 \
> -device vhost-user-blk-pci,chardev=char0
>
> Based-on: 20200918080912.321299-1-coiby.xu@gmail.com ("[PATCH v10 0/7] vhost-user block device backend implementation")
> Based-on: 20200907182011.521007-1-kwolf@redhat.com ("[PATCH 00/29] block/export: Add infrastructure and QAPI for block exports")
>
> Stefan Hajnoczi (13):
> block/export: shorten serial string to fit
> util/vhost-user-server: s/fileds/fields/ typo fix
> util/vhost-user-server: drop unnecessary QOM cast
> util/vhost-user-server: drop unnecessary watch deletion
> block/export: consolidate request structs into VuBlockReq
> util/vhost-user-server: drop unused DevicePanicNotifier
> util/vhost-user-server: fix memory leak in vu_message_read()
> util/vhost-user-server: check EOF when reading payload
> util/vhost-user-server: rework vu_client_trip() coroutine lifecycle
> block/export: report flush errors
> block/export: convert vhost-user-blk server to block export API
> util/vhost-user-server: move header to include/
> util/vhost-user-server: use static library in meson.build
>
> MAINTAINERS | 4 +-
> qapi/block-export.json | 21 +-
> block/export/vhost-user-blk-server.h | 23 +-
> {util => include/qemu}/vhost-user-server.h | 32 +-
> block/export/export.c | 8 +-
> block/export/vhost-user-blk-server.c | 525 ++++++---------------
> tests/qtest/vhost-user-blk-test.c | 2 +-
> util/vhost-user-server.c | 334 ++++++-------
> block/export/meson.build | 1 +
> block/meson.build | 1 -
> contrib/libvhost-user/meson.build | 1 +
> meson.build | 6 +-
> tests/qtest/meson.build | 2 +-
> util/meson.build | 4 +-
> 14 files changed, 376 insertions(+), 588 deletions(-)
> rename {util => include/qemu}/vhost-user-server.h (72%)
>
> --
> 2.26.2
>
Thanks, applied to my block tree with a mention of the QAPI schema
situation regarding address families as suggested by Markus:
https://github.com/stefanha/qemu/commits/block
Stefan