Fix generation of systemtap probes for RPC protocols

The naming used in the RPC protocols for the LXC monitor and
lock daemon confused the script used to generate systemtap
helper functions. Rename the LXC monitor protocol symbols to
reduce confusion. Adapt the gensystemtap.pl script to cope
with the LXC monitor / lock daemon naming conversions.

This has no functional impact on RPC wire protocol, since
names are only used in the C layer

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

1 files changed, 12 insertions, 12 deletions

diff --git a/src/lxc/lxc_monitor_protocol.x b/src/lxc/lxc_monitor_protocol.x
index 0f041f6c55..0926e26f64 100644
--- a/src/lxc/lxc_monitor_protocol.x
+++ b/src/lxc/lxc_monitor_protocol.x
@@ -4,24 +4,24 @@
  * the libvirt_lxc helper program.
  */
 
-enum virLXCProtocolExitStatus {
-    VIR_LXC_PROTOCOL_EXIT_STATUS_ERROR,
-    VIR_LXC_PROTOCOL_EXIT_STATUS_SHUTDOWN,
-    VIR_LXC_PROTOCOL_EXIT_STATUS_REBOOT
+enum virLXCMonitorExitStatus {
+    VIR_LXC_MONITOR_EXIT_STATUS_ERROR,
+    VIR_LXC_MONITOR_EXIT_STATUS_SHUTDOWN,
+    VIR_LXC_MONITOR_EXIT_STATUS_REBOOT
 };
 
-struct virLXCProtocolExitEventMsg {
-    enum virLXCProtocolExitStatus status;
+struct virLXCMonitorExitEventMsg {
+    enum virLXCMonitorExitStatus status;
 };
 
-struct virLXCProtocolInitEventMsg {
+struct virLXCMonitorInitEventMsg {
     unsigned hyper initpid;
 };
 
-const VIR_LXC_PROTOCOL_PROGRAM = 0x12341234;
-const VIR_LXC_PROTOCOL_PROGRAM_VERSION = 1;
+const VIR_LXC_MONITOR_PROGRAM = 0x12341234;
+const VIR_LXC_MONITOR_PROGRAM_VERSION = 1;
 
-enum virLXCProtocolProcedure {
-    VIR_LXC_PROTOCOL_PROC_EXIT_EVENT = 1, /* skipgen skipgen */
-    VIR_LXC_PROTOCOL_PROC_INIT_EVENT = 2 /* skipgen skipgen */
+enum virLXCMonitorProcedure {
+    VIR_LXC_MONITOR_PROC_EXIT_EVENT = 1, /* skipgen skipgen */
+    VIR_LXC_MONITOR_PROC_INIT_EVENT = 2 /* skipgen skipgen */
 };