Re: [libvirt] [PATCH 1/4] admin: move admins server impl/dispatch into src/admin directory
On 01/19/2018 06:09 PM, Daniel P. Berrange wrote:
The admin server functionality is a generic concept that should be
wired
up into all libvirt daemons, but is currently integrated with the
libvirtd code. Move it all into the src/admin directory to prepare for
broader reuse.
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
.gitignore | 1 +
cfg.mk | 2 +-
daemon/Makefile.am | 33 +---------------------
daemon/libvirtd.c | 2 +-
daemon/libvirtd.h | 10 -------
po/POTFILES.in | 4 +--
src/Makefile.am | 31 +++++++++++++++++++-
{daemon => src/admin}/admin_server.c | 4 +--
{daemon => src/admin}/admin_server.h | 6 ++--
.../admin.c => src/admin/admin_server_dispatch.c | 21 +++++++++-----
.../admin.h => src/admin/admin_server_dispatch.h | 9 +++---
11 files changed, 60 insertions(+), 63 deletions(-)
rename {daemon => src/admin}/admin_server.c (99%)
rename {daemon => src/admin}/admin_server.h (96%)
rename daemon/admin.c => src/admin/admin_server_dispatch.c (96%)
rename daemon/admin.h => src/admin/admin_server_dispatch.h (83%)
Missed couple of occurrences:
diff --git i/cfg.mk w/cfg.mk
index 4635f9f77..4743f48f3 100644
--- i/cfg.mk
+++ w/cfg.mk
@@ -1119,7 +1119,7 @@ sc_po_check: \
$(srcdir)/daemon/remote_dispatch.h \
$(srcdir)/daemon/qemu_dispatch.h \
$(srcdir)/src/remote/remote_client_bodies.h \
- $(srcdir)/daemon/admin_dispatch.h \
+ $(srcdir)/src/admin/admin_server_dispatch_stubs.h \
$(srcdir)/src/admin/admin_client.h
$(srcdir)/daemon/remote_dispatch.h: $(srcdir)/src/remote/remote_protocol.x
$(MAKE) -C daemon remote_dispatch.h
@@ -1127,8 +1127,8 @@ $(srcdir)/daemon/qemu_dispatch.h:
$(srcdir)/src/remote/qemu_protocol.x
$(MAKE) -C daemon qemu_dispatch.h
$(srcdir)/src/remote/remote_client_bodies.h: $(srcdir)/src/remote/remote_protocol.x
$(MAKE) -C src remote/remote_client_bodies.h
-$(srcdir)/daemon/admin_dispatch.h: $(srcdir)/src/admin/admin_protocol.x
- $(MAKE) -C daemon admin_dispatch.h
+ $(srcdir)/src/admin/admin_server_dispatch_stubs.h:
$(srcdir)/src/admin/admin_protocol.x
+ $(MAKE) -C src admin/admin_server_dispatch_stubs.h
$(srcdir)/src/admin/admin_client.h: $(srcdir)/src/admin/admin_protocol.x
$(MAKE) -C src admin/admin_client.h
diff --git i/po/POTFILES.in w/po/POTFILES.in
index 4c0abb18a..106b26277 100644
--- i/po/POTFILES.in
+++ w/po/POTFILES.in
@@ -1,4 +1,3 @@
-daemon/admin_dispatch.h
daemon/libvirtd-config.c
daemon/libvirtd.c
daemon/qemu_dispatch.h
Michal