Rename lxc_protocol.x to lxc_monitor_protocol.x

To avoid confusion between the LXC driver <-> controller
monitor RPC protocol and the libvirt-lxc.so <-> libvirtd public
RPC protocol, rename the former to lxc_monitor_protocol.x

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

diff --git a/.gitignore b/.gitignore
index 0557d591628f833d695346a930933f245b8051a5..882ae4ca6b59afc59ad3a50e2e7d7ddcdb40eed0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -115,8 +115,8 @@
 /src/locking/test_libvirt_sanlock.aug
 /src/lxc/lxc_controller_dispatch.h
 /src/lxc/lxc_monitor_dispatch.h
-/src/lxc/lxc_protocol.c
-/src/lxc/lxc_protocol.h
+/src/lxc/lxc_monitor_protocol.c
+/src/lxc/lxc_monitor_protocol.h
 /src/lxc/test_libvirtd_lxc.aug
 /src/qemu/test_libvirtd_qemu.aug
 /src/remote/*_client_bodies.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 0c8be2052e21255fe044c35a76153a159ac2252e..e8648ce04ac19b02cab56cecd02f71a040bc4175 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -413,9 +413,9 @@ if WITH_XEN_INOTIFY
 XEN_DRIVER_SOURCES += xen/xen_inotify.c xen/xen_inotify.h
 endif
 
-LXC_PROTOCOL_GENERATED = \
-       $(srcdir)/lxc/lxc_protocol.h \
-       $(srcdir)/lxc/lxc_protocol.c \
+LXC_MONITOR_PROTOCOL_GENERATED = \
+       $(srcdir)/lxc/lxc_monitor_protocol.h \
+       $(srcdir)/lxc/lxc_monitor_protocol.c \
        $(NULL)
 
 LXC_MONITOR_GENERATED = \
@@ -427,32 +427,32 @@ LXC_CONTROLLER_GENERATED = \
        $(NULL)
 
 LXC_GENERATED = \
-       $(LXC_PROTOCOL_GENERATED) \
+       $(LXC_MONITOR_PROTOCOL_GENERATED) \
        $(LXC_MONITOR_GENERATED) \
        $(LXC_CONTROLLER_GENERATED) \
        $(NULL)
 
-LXC_PROTOCOL = $(srcdir)/lxc/lxc_protocol.x
+LXC_MONITOR_PROTOCOL = $(srcdir)/lxc/lxc_monitor_protocol.x
 
 $(srcdir)/lxc/lxc_monitor_dispatch.h: $(srcdir)/rpc/gendispatch.pl \
-               $(LXC_PROTOCOL)
+               $(LXC_MONITOR_PROTOCOL)
        $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl \
-         -k virLXCProtocol VIR_LXC_PROTOCOL $(LXC_PROTOCOL) > $@
+         -k virLXCProtocol VIR_LXC_MONITOR_PROTOCOL $(LXC_MONITOR_PROTOCOL) > $@
 
 $(srcdir)/lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \
                $(REMOTE_PROTOCOL)
        $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl \
-         -b virLXCProtocol VIR_LXC_PROTOCOL $(LXC_PROTOCOL) > $@
+         -b virLXCProtocol VIR_LXC_MONITOR_PROTOCOL $(LXC_MONITOR_PROTOCOL) > $@
 
 EXTRA_DIST += \
-       $(LXC_PROTOCOL) \
+       $(LXC_MONITOR_PROTOCOL) \
        $(LXC_GENERATED) \
        $(NULL)
 
 BUILT_SOURCES += $(LXC_GENERATED)
 
 LXC_DRIVER_SOURCES =                                           \
-               $(LXC_PROTOCOL_GENERATED)                       \
+               $(LXC_MONITOR_PROTOCOL_GENERATED)               \
                $(LXC_MONITOR_GENERATED)                        \
                lxc/lxc_conf.c lxc/lxc_conf.h                   \
                lxc/lxc_container.c lxc/lxc_container.h         \
@@ -465,7 +465,7 @@ LXC_DRIVER_SOURCES =                                                \
                lxc/lxc_driver.c lxc/lxc_driver.h
 
 LXC_CONTROLLER_SOURCES =                                       \
-               $(LXC_PROTOCOL_GENERATED)                       \
+               $(LXC_MONITOR_PROTOCOL_GENERATED)               \
                $(LXC_CONTROLLER_GENERATED)                     \
                lxc/lxc_conf.c lxc/lxc_conf.h                   \
                lxc/lxc_container.c lxc/lxc_container.h         \

diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index a1c264c49a4b23db552f068c9a5a157c0c0a2028..43cbad5aa6c3689e434b974647ffd0d10d3c9b8f 100644 (file)
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -58,7 +58,7 @@
 #include "lxc_conf.h"
 #include "lxc_container.h"
 #include "lxc_cgroup.h"
-#include "lxc_protocol.h"
+#include "lxc_monitor_protocol.h"
 #include "lxc_fuse.h"
 #include "virnetdev.h"
 #include "virnetdevveth.h"

diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c
index 65194a5ea71f843aa15bf44a84c5fc292b0ad07d..6971bcbaedacc9cd287e3bd1d30ab0ab847b09e3 100644 (file)
--- a/src/lxc/lxc_monitor.c
+++ b/src/lxc/lxc_monitor.c
@@ -22,7 +22,6 @@
 
 #include "lxc_monitor.h"
 #include "lxc_conf.h"
-#include "lxc_protocol.h"
 #include "lxc_monitor_dispatch.h"
 
 #include "viralloc.h"

diff --git a/src/lxc/lxc_monitor.h b/src/lxc/lxc_monitor.h
index 9b06a37204c7af243f93b1d3edd842867af4b87a..cc31a9c2cbe0580953edaee9f2c4e2114336b04d 100644 (file)
--- a/src/lxc/lxc_monitor.h
+++ b/src/lxc/lxc_monitor.h
@@ -23,7 +23,7 @@
 
 # include "virobject.h"
 # include "domain_conf.h"
-# include "lxc_protocol.h"
+# include "lxc_monitor_protocol.h"
 
 typedef struct _virLXCMonitor virLXCMonitor;
 typedef virLXCMonitor *virLXCMonitorPtr;

diff --git a/src/lxc/lxc_protocol.x b/src/lxc/lxc_monitor_protocol.x
similarity index 100%
rename from src/lxc/lxc_protocol.x
rename to src/lxc/lxc_monitor_protocol.x