[libvirt] [PATCH 07/25] 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(a)redhat.com>
---
build-aux/syntax-check.mk | 6 +++---
po/POTFILES | 2 +-
src/remote/Makefile.inc.am | 12 ++++++------
src/remote/remote_daemon_dispatch.c | 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk
index 033eaf70c4..c88c1991f4 100644
--- a/build-aux/syntax-check.mk
+++ b/build-aux/syntax-check.mk
@@ -2163,14 +2163,14 @@ group-qemu-caps:
# sc_po_check can fail if generated files are not built first
sc_po_check: \
$(srcdir)/src/remote/remote_daemon_dispatch_stubs.h \
- $(srcdir)/src/remote/remote_daemon_dispatch_qemu_stubs.h \
+ $(srcdir)/src/remote/qemu_daemon_dispatch_stubs.h \
$(srcdir)/src/remote/remote_client_bodies.h \
$(srcdir)/src/admin/admin_server_dispatch_stubs.h \
$(srcdir)/src/admin/admin_client.h
$(srcdir)/src/remote/remote_daemon_dispatch_stubs.h:
$(srcdir)/src/remote/remote_protocol.x
$(MAKE) -C src remote/remote_daemon_dispatch_stubs.h
-$(srcdir)/src/remote/remote_daemon_dispatch_qemu_stubs.h:
$(srcdir)/src/remote/qemu_protocol.x
- $(MAKE) -C src remote/remote_daemon_dispatch_qemu_stubs.h
+$(srcdir)/src/remote/qemu_daemon_dispatch_stubs.h: $(srcdir)/src/remote/qemu_protocol.x
+ $(MAKE) -C src remote/qemu_daemon_dispatch_stubs.h
$(srcdir)/src/remote/remote_client_bodies.h: $(srcdir)/src/remote/remote_protocol.x
$(MAKE) -C src remote/remote_client_bodies.h
$(srcdir)/src/admin/admin_server_dispatch_stubs.h: $(srcdir)/src/admin/admin_protocol.x
diff --git a/po/POTFILES b/po/POTFILES
index 9385fc4e15..8a6df49eeb 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -146,12 +146,12 @@ src/qemu/qemu_monitor_json.c
src/qemu/qemu_monitor_text.c
src/qemu/qemu_process.c
src/qemu/qemu_qapi.c
+src/remote/qemu_daemon_dispatch_stubs.h
src/remote/remote_client_bodies.h
src/remote/remote_daemon.c
src/remote/remote_daemon_config.c
src/remote/remote_daemon_dispatch.c
src/remote/remote_daemon_dispatch_stubs.h
-src/remote/remote_daemon_dispatch_qemu_stubs.h
src/remote/remote_daemon_stream.c
src/remote/remote_driver.c
src/rpc/virkeepalive.c
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 071d19d26a..acea567abe 100644
--- 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 = \
@@ -438,17 +438,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 56a46a13be..3d834e2718 100644
--- 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 */
--
2.21.0