aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2020-09-24 16:15:48 +0100
committerStefan Hajnoczi <stefanha@redhat.com>2020-10-23 13:42:16 +0100
commit80a06cc52bcf7a9771407306991a816834c04941 (patch)
tree113511c4b74c4bab4a86dd84b49ce68636c67074
parent90fc91d50b76cf3f32e2ad5b79484ac9680e1d6a (diff)
downloadqemu-80a06cc52bcf7a9771407306991a816834c04941.zip
qemu-80a06cc52bcf7a9771407306991a816834c04941.tar.gz
qemu-80a06cc52bcf7a9771407306991a816834c04941.tar.bz2
util/vhost-user-server: move header to include/
Headers used by other subsystems are located in include/. Also add the vhost-user-server and vhost-user-blk-server headers to MAINTAINERS. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Message-id: 20200924151549.913737-13-stefanha@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r--MAINTAINERS4
-rw-r--r--block/export/vhost-user-blk-server.c2
-rw-r--r--include/qemu/vhost-user-server.h (renamed from util/vhost-user-server.h)0
-rw-r--r--util/vhost-user-server.c2
4 files changed, 5 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 2789952..ef6f5c7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3073,8 +3073,10 @@ Vhost-user block device backend server
M: Coiby Xu <Coiby.Xu@gmail.com>
S: Maintained
F: block/export/vhost-user-blk-server.c
-F: util/vhost-user-server.c
+F: block/export/vhost-user-blk-server.h
+F: include/qemu/vhost-user-server.h
F: tests/qtest/libqos/vhost-user-blk.c
+F: util/vhost-user-server.c
Replication
M: Wen Congyang <wencongyang2@huawei.com>
diff --git a/block/export/vhost-user-blk-server.c b/block/export/vhost-user-blk-server.c
index 3e5bd6c..f7021cb 100644
--- a/block/export/vhost-user-blk-server.c
+++ b/block/export/vhost-user-blk-server.c
@@ -13,7 +13,7 @@
#include "block/block.h"
#include "contrib/libvhost-user/libvhost-user.h"
#include "standard-headers/linux/virtio_blk.h"
-#include "util/vhost-user-server.h"
+#include "qemu/vhost-user-server.h"
#include "vhost-user-blk-server.h"
#include "qapi/error.h"
#include "qom/object_interfaces.h"
diff --git a/util/vhost-user-server.h b/include/qemu/vhost-user-server.h
index 0da4c2c..0da4c2c 100644
--- a/util/vhost-user-server.h
+++ b/include/qemu/vhost-user-server.h
diff --git a/util/vhost-user-server.c b/util/vhost-user-server.c
index 516999b..783d847 100644
--- a/util/vhost-user-server.c
+++ b/util/vhost-user-server.c
@@ -9,8 +9,8 @@
*/
#include "qemu/osdep.h"
#include "qemu/main-loop.h"
+#include "qemu/vhost-user-server.h"
#include "block/aio-wait.h"
-#include "vhost-user-server.h"
/*
* Theory of operation: