11:08 a.m.
From: "Daniel P. Berrange" <berrange(a)redhat.com>
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(a)redhat.com>
---
.gitignore | 4 ++--
src/Makefile.am | 22 +++++++++++-----------
src/lxc/lxc_controller.c | 2 +-
src/lxc/lxc_monitor.c | 1 -
src/lxc/lxc_monitor.h | 2 +-
src/lxc/{lxc_protocol.x => lxc_monitor_protocol.x} | 0
6 files changed, 15 insertions(+), 16 deletions(-)
rename src/lxc/{lxc_protocol.x => lxc_monitor_protocol.x} (100%)
diff --git a/.gitignore b/.gitignore
index 0557d59..882ae4c 100644
--- 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 f7a9b91..494c184 100644
--- 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 c9d96b3..5617a54 100644
--- 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 65194a5..6971bcb 100644
--- 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 9b06a37..cc31a9c 100644
--- 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
--
1.7.11.7