remote: unify rpc server dispatch generated files

Our naming was not consistent.  Use the protocol name as prefix for all
generated files.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk
index 75993ee284f7c01ca6431a8db3d964a426cef4a2..156c72d4526ad2b70673cab3bcd515252e43ee76 100644 (file)
--- a/build-aux/syntax-check.mk
+++ b/build-aux/syntax-check.mk
@@ -1976,7 +1976,8 @@ po_file ?= $(srcdir)/po/POTFILES.in
 generated_files = \
   $(builddir)/src/*.[ch] \
   $(builddir)/src/*/*.[ch] \
-  $(srcdir)/src/*/{remote_daemon,admin_server,log_daemon,lock_daemon}_dispatch_*stubs.h \
+  $(srcdir)/src/*/{remote,qemu,lxc,log,lock}_daemon_dispatch_stubs.h \
+  $(srcdir)/src/admin/admin_server_dispatch_stubs.h \
   $(srcdir)/src/lxc/{lxc_monitor,lxc_controller}_dispatch.h \
   $(srcdir)/src/remote/*_client_bodies.h \
   $(srcdir)/src/*/*_protocol.[ch] \

diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 00f2212909660b7b5f2c17733b5de8c1974c2f4e..5c5f5f4d2c8c56843cb19aab2cb3bcfad149a1bb 100644 (file)
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -20,8 +20,8 @@ REMOTE_DRIVER_SOURCES = \
 
 REMOTE_DAEMON_GENERATED = \
        remote/remote_daemon_dispatch_stubs.h \
-       remote/remote_daemon_dispatch_lxc_stubs.h \
-       remote/remote_daemon_dispatch_qemu_stubs.h \
+       remote/lxc_daemon_dispatch_stubs.h \
+       remote/qemu_daemon_dispatch_stubs.h \
        $(NULL)
 
 REMOTE_DAEMON_SOURCES = \
@@ -442,17 +442,17 @@ remote/remote_daemon_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \
          --mode=server remote REMOTE $(REMOTE_PROTOCOL) \
          > $(srcdir)/remote/remote_daemon_dispatch_stubs.h
 
-remote/remote_daemon_dispatch_lxc_stubs.h: $(srcdir)/rpc/gendispatch.pl \
+remote/lxc_daemon_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \
                $(LXC_PROTOCOL) Makefile.am
        $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \
          --mode=server lxc LXC $(LXC_PROTOCOL) \
-         > $(srcdir)/remote/remote_daemon_dispatch_lxc_stubs.h
+         > $(srcdir)/remote/lxc_daemon_dispatch_stubs.h
 
-remote/remote_daemon_dispatch_qemu_stubs.h: $(srcdir)/rpc/gendispatch.pl \
+remote/qemu_daemon_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \
                $(QEMU_PROTOCOL) Makefile.am
        $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \
          --mode=server qemu QEMU $(QEMU_PROTOCOL) \
-         > $(srcdir)/remote/remote_daemon_dispatch_qemu_stubs.h
+         > $(srcdir)/remote/qemu_daemon_dispatch_stubs.h
 
 libvirtd.8.in: remote/libvirtd.pod
        $(AM_V_GEN)$(POD2MAN) --section=8 $< $@-t1 && \

diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c
index be20556128ae4eba57c0ea9f36ec5d439c0953f2..66693ff7aec336aae03ae9568b2b64d216c85702 100644 (file)
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -131,8 +131,8 @@ remoteGetStorageConn(virNetServerClientPtr client);
 
 
 #include "remote_daemon_dispatch_stubs.h"
-#include "remote_daemon_dispatch_qemu_stubs.h"
-#include "remote_daemon_dispatch_lxc_stubs.h"
+#include "qemu_daemon_dispatch_stubs.h"
+#include "lxc_daemon_dispatch_stubs.h"
 
 
 /* Prototypes */