aboutsummaryrefslogtreecommitdiff
path: root/util/vhost-user-server.c
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2020-09-24 16:15:47 +0100
committerStefan Hajnoczi <stefanha@redhat.com>2020-10-23 13:42:16 +0100
commit90fc91d50b76cf3f32e2ad5b79484ac9680e1d6a (patch)
tree89c6e314cd032b9bb64e28165e68f2c56499f6a3 /util/vhost-user-server.c
parent0534b1b227ef85c59d65b5ec5bee9bcfb8f91b1f (diff)
downloadqemu-90fc91d50b76cf3f32e2ad5b79484ac9680e1d6a.zip
qemu-90fc91d50b76cf3f32e2ad5b79484ac9680e1d6a.tar.gz
qemu-90fc91d50b76cf3f32e2ad5b79484ac9680e1d6a.tar.bz2
block/export: convert vhost-user-blk server to block export API
Use the new QAPI block exports API instead of defining our own QOM objects. This is a large change because the lifecycle of VuBlockDev needs to follow BlockExportDriver. QOM properties are replaced by QAPI options objects. VuBlockDev is renamed VuBlkExport and contains a BlockExport field. Several fields can be dropped since BlockExport already has equivalents. The file names and meson build integration will be adjusted in a future patch. libvhost-user should probably be built as a static library that is linked into QEMU instead of as a .c file that results in duplicate compilation. The new command-line syntax is: $ qemu-storage-daemon \ --blockdev file,node-name=drive0,filename=test.img \ --export vhost-user-blk,node-name=drive0,id=export0,unix-socket=/tmp/vhost-user-blk.sock Note that unix-socket is optional because we may wish to accept chardevs too in the future. Markus noted that supported address families are not explicit in the QAPI schema. It is unlikely that support for more address families will be added since file descriptor passing is required and few address families support it. If a new address family needs to be added, then the QAPI 'features' syntax can be used to advertize them. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Acked-by: Markus Armbruster <armbru@redhat.com> Message-id: 20200924151549.913737-12-stefanha@redhat.com [Skip test on big-endian host architectures because this device doesn't support them yet (as already mentioned in a code comment). --Stefan] Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'util/vhost-user-server.c')
-rw-r--r--util/vhost-user-server.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/util/vhost-user-server.c b/util/vhost-user-server.c
index c448800..516999b 100644
--- a/util/vhost-user-server.c
+++ b/util/vhost-user-server.c
@@ -408,7 +408,15 @@ bool vhost_user_server_start(VuServer *server,
Error **errp)
{
QEMUBH *bh;
- QIONetListener *listener = qio_net_listener_new();
+ QIONetListener *listener;
+
+ if (socket_addr->type != SOCKET_ADDRESS_TYPE_UNIX &&
+ socket_addr->type != SOCKET_ADDRESS_TYPE_FD) {
+ error_setg(errp, "Only socket address types 'unix' and 'fd' are supported");
+ return false;
+ }
+
+ listener = qio_net_listener_new();
if (qio_net_listener_open_sync(listener, socket_addr, 1,
errp) < 0) {
object_unref(OBJECT(listener));