From 92f0a7f5af6dbb9efd19ab269baf941b53df63a6 Mon Sep 17 00:00:00 2001
From: Osier Yang <jyang@redhat.com>
Date: Sun, 17 Jul 2011 12:41:39 +0800
Subject: [PATCH] rpc: Fix typos in rpc generator scripts

These typos are introduced by file renaming in commit b17b4afaf.

src/remote/qemu_protocol.x \
src/remote/remote_protocol.x \
src/rpc/gendispatch.pl:
    s/remote_generator/gendispatch/

src/rpc/genprotocol.pl:
    s/remote\/remote_protocol/remote_protocol/
---
 src/remote/qemu_protocol.x   | 2 +-
 src/remote/remote_protocol.x | 6 +++---
 src/rpc/gendispatch.pl       | 6 +++---
 src/rpc/genprotocol.pl       | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/remote/qemu_protocol.x b/src/remote/qemu_protocol.x
index 0bafbafa77..3279405b76 100644
--- a/src/remote/qemu_protocol.x
+++ b/src/remote/qemu_protocol.x
@@ -53,7 +53,7 @@ const QEMU_PROTOCOL_VERSION = 1;
 
 enum qemu_procedure {
     /* Each function must have a two-word comment.  The first word is
-     * whether remote_generator.pl handles daemon, the second whether
+     * whether gendispatch.pl handles daemon, the second whether
      * it handles src/remote.  */
     QEMU_PROC_MONITOR_COMMAND = 1, /* skipgen skipgen */
     QEMU_PROC_DOMAIN_ATTACH = 2 /* autogen autogen */
diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index ee169fd0df..d72a60d9c4 100644
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -339,7 +339,7 @@ struct remote_node_get_memory_stats {
  * connection).  Errors are returned implicitly in the RPC protocol.
  *
  * Please follow the naming convention carefully - this file is
- * parsed by 'remote_generator.pl'.
+ * parsed by 'gendispatch.pl'.
  *
  * 'remote_CALL_ret' members that are filled via call-by-reference must be
  * annotated with a insert@<offset> comment to indicate the offset in the
@@ -2123,7 +2123,7 @@ const REMOTE_PROTOCOL_VERSION = 1;
 
 enum remote_procedure {
     /* Each function must have a two-word comment.  The first word is
-     * whether remote_generator.pl handles daemon, the second whether
+     * whether gendispatch.pl handles daemon, the second whether
      * it handles src/remote.  Additional flags can be specified after a
      * pipe.
      *
@@ -2390,7 +2390,7 @@ enum remote_procedure {
      * Nice isn't it. Please keep it this way when adding more.
      *
      * Each function must have a two-word comment.  The first word is
-     * whether remote_generator.pl handles daemon, the second whether
+     * whether gendispatch.pl handles daemon, the second whether
      * it handles src/remote.  Additional flags can be specified after a
      * pipe.
      *
diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl
index 85a0c0eead..e068b53806 100755
--- a/src/rpc/gendispatch.pl
+++ b/src/rpc/gendispatch.pl
@@ -9,8 +9,8 @@
 # for both remote_protocol.x and qemu_protocol.x, you would run the
 # following:
 #
-# remote_generator.pl -c -t remote ../src/remote/remote_protocol.x
-# remote_generator.pl -t qemu ../src/remote/qemu_protocol.x
+# gendispatch.pl -c -t remote ../src/remote/remote_protocol.x
+# gendispatch.pl -t qemu ../src/remote/qemu_protocol.x
 #
 # By Richard Jones <rjones@redhat.com>
 # Extended by Matthias Bolte <matthias.bolte@googlemail.com>
@@ -239,7 +239,7 @@ sub hyper_to_long
 # Output
 
 print <<__EOF__;
-/* Automatically generated by remote_generator.pl.
+/* Automatically generated by gendispatch.pl.
  * Do not edit this file.  Any changes you make will be lost.
  */
 __EOF__
diff --git a/src/rpc/genprotocol.pl b/src/rpc/genprotocol.pl
index 4edba98df0..7124e5c0c5 100755
--- a/src/rpc/genprotocol.pl
+++ b/src/rpc/genprotocol.pl
@@ -59,7 +59,7 @@ while (<RPCGEN>) {
     s/xdr_u_quad_t/xdr_uint64_t/g;
     s/xdr_quad_t/xdr_int64_t/g;
     s/(?<!IXDR_GET_INT32 )IXDR_GET_LONG/IXDR_GET_INT32/g;
-    s,#include "\./remote/remote_protocol\.h",#include "remote_protocol.h",;
+    s,#include "remote/remote_protocol\.h",#include "remote_protocol.h",;
 
     if (m/^}/) {
 	$in_function = 0;
-- 
2.47.2