Replace RPC rm prefix with vg.

2008-12-17  Neal H. Walfield  <neal@gnu.org>

	* viengoos/activity.h (RM_activity_policy): Rename from this...
	(VG_activity_policy): ... to this.  Update users.
	(RM_activity_info): Rename from this...
	(VG_activity_info): ... to this.  Update users.
	(RPC_STUB_PREFIX): Define to vg.
	(RPC_ID_PREFIX): Define to VG.
	* viengoos/cap.h
	(RM_cap_copy): Rename from this...
	(VG_cap_copy): ... to this.  Update users.
	(RM_cap_rubout): Rename from this...
	(VG_cap_rubout): ... to this.  Update users.
	(RM_cap_read): Rename from this...
	(VG_cap_read): ... to this.  Update users.
	(RM_object_discarded_clear): Rename from this...
	(VG_object_discarded_clear): ... to this.  Update users.
	(RM_object_discard): Rename from this...
	(VG_object_discard): ... to this.  Update users.
	(RM_object_status): Rename from this...
	(VG_object_status): ... to this.  Update users.
	(RM_object_reply_on_destruction): Rename from this...
	(VG_object_reply_on_destruction): ... to this.  Update users.
	(RM_object_name): Rename from this...
	(VG_object_name): ... to this.  Update users.
	(RPC_STUB_PREFIX): Define to vg.
	(RPC_ID_PREFIX): Define to VG.
	* viengoos/folio.h (RM_folio_alloc): Rename from this...
	(VG_folio_alloc): ... to this.  Update users.
	(RM_folio_free): Rename from this...
	(Vg_folio_free): ... to this.  Update users.
	(RM_folio_object_alloc): Rename from this...
	(VG_folio_object_alloc): ... to this.  Update users.
	(RM_folio_policy): Rename from this...
	(VG_folio_policy): ... to this.  Update users.
	(RPC_STUB_PREFIX): Define to vg.
	(RPC_ID_PREFIX): Define to VG.
	* viengoos/futex.h (RM_futex): Rename from this...
	(VG_futex): ... to this.  Update users.
	(RPC_STUB_PREFIX): Define to vg.
	(RPC_ID_PREFIX): Define to VG.
	* viengoos/misc.h (RM_write): Rename from this...
	(VG_write): ... to this.  Update users.
	(RM_read): Rename from this...
	(VG_read): ... to this.  Update users.
	(RM_as_dump): Rename from this...
	(VG_as_dump): ... to this.  Update users.
	(RM_fault): Rename from this...
	(VG_fault): ... to this.  Update users.
	(RPC_STUB_PREFIX): Define to vg.
	(RPC_ID_PREFIX): Define to VG.
	* viengoos/thread.h (RM_thread_exregs): Rename from this...
	(RM_thread_exregs): ... to this.  Update users.
	(RM_thread_id): Rename from this...
	(RM_thread_id): ... to this.  Update users.
	(RM_thread_activation_collect): Rename from this...
	(RM_thread_activation_collect): ... to this.  Update users.
	(RPC_STUB_PREFIX): Define to vg.
	(RPC_ID_PREFIX): Define to VG.

6 files changed, 64 insertions, 64 deletions

diff --git a/libviengoos/viengoos/activity.h b/libviengoos/viengoos/activity.h
index 8f5375b..bc10f7d 100644
--- a/libviengoos/viengoos/activity.h
+++ b/libviengoos/viengoos/activity.h
@@ -25,8 +25,8 @@
 
 enum
   {
-    RM_activity_policy = 700,
-    RM_activity_info,
+    VG_activity_policy = 700,
+    VG_activity_info,
   };
 
 struct activity_memory_policy
@@ -165,8 +165,8 @@ struct activity_stats
 		  VG_ACTIVITY_MEMORY_POLICY_VOID,	\
 		  0)
 
-#define RPC_STUB_PREFIX rm
-#define RPC_ID_PREFIX RM
+#define RPC_STUB_PREFIX vg
+#define RPC_ID_PREFIX VG
 
 #include <viengoos/rpc.h>
 
diff --git a/libviengoos/viengoos/cap.h b/libviengoos/viengoos/cap.h
index 32e475a..e6cb1e4 100644
--- a/libviengoos/viengoos/cap.h
+++ b/libviengoos/viengoos/cap.h
@@ -379,22 +379,22 @@ struct vg_cap
 
 /* Capability-related methods.  */
 
-#define RPC_STUB_PREFIX rm
-#define RPC_ID_PREFIX RM
+#define RPC_STUB_PREFIX vg
+#define RPC_ID_PREFIX VG
 
 #include <viengoos/rpc.h>
 
 enum
   {
-    RM_cap_copy = 300,
-    RM_cap_rubout,
-    RM_cap_read,
-
-    RM_object_discarded_clear = 400,
-    RM_object_discard,
-    RM_object_status,
-    RM_object_reply_on_destruction,
-    RM_object_name,
+    VG_cap_copy = 300,
+    VG_cap_rubout,
+    VG_cap_read,
+
+    VG_object_discarded_clear = 400,
+    VG_object_discard,
+    VG_object_status,
+    VG_object_reply_on_destruction,
+    VG_object_name,
   };
 
 enum
@@ -694,7 +694,7 @@ vg_cap_copy_x (activity_t activity,
   assert (! VG_ADDR_IS_VOID (target_addr));
   assert (! VG_ADDR_IS_VOID (source_addr));
 
-  error_t err = rm_cap_copy (activity, target_address_space, target_addr,
+  error_t err = vg_cap_copy (activity, target_address_space, target_addr,
 			     source_address_space, source_addr,
 			     flags, properties);
   assert (err == 0);
diff --git a/libviengoos/viengoos/folio.h b/libviengoos/viengoos/folio.h
index d135e02..728fe7f 100644
--- a/libviengoos/viengoos/folio.h
+++ b/libviengoos/viengoos/folio.h
@@ -371,17 +371,17 @@ vg_folio_object_cap (struct folio *folio, int object)
 }
 #endif
 
-#define RPC_STUB_PREFIX rm
-#define RPC_ID_PREFIX RM
+#define RPC_STUB_PREFIX vg
+#define RPC_ID_PREFIX VG
 
 #include <viengoos/rpc.h>
 
 enum
   {
-    RM_folio_alloc = 200,
-    RM_folio_free,
-    RM_folio_object_alloc,
-    RM_folio_policy
+    VG_folio_alloc = 200,
+    VG_folio_free,
+    VG_folio_object_alloc,
+    VG_folio_policy
   };
 
 /* Allocate a folio against ACTIVITY.  Return a capability in the
diff --git a/libviengoos/viengoos/futex.h b/libviengoos/viengoos/futex.h
index 49cb4a2..b9f23c9 100644
--- a/libviengoos/viengoos/futex.h
+++ b/libviengoos/viengoos/futex.h
@@ -33,11 +33,11 @@
 
 enum
   {
-    RM_futex = 800,
+    VG_futex = 800,
   };
 
-#define RPC_STUB_PREFIX rm
-#define RPC_ID_PREFIX RM
+#define RPC_STUB_PREFIX vg
+#define RPC_ID_PREFIX VG
 
 #include <viengoos/rpc.h>
 
@@ -137,7 +137,7 @@ vg_futex_using (struct hurd_message_buffer *mb,
 			  addr1, op, val1, !! timespec, val2, addr2,
 			  (union futex_val3) val3, &ret);
   else
-    err = rm_futex (VG_ADDR_VOID, VG_ADDR_VOID,
+    err = vg_futex (VG_ADDR_VOID, VG_ADDR_VOID,
 		    addr1, op, val1, !! timespec, val2, addr2,
 		    (union futex_val3) val3, &ret);
   return (struct vg_futex_return) { err, ret };
diff --git a/libviengoos/viengoos/misc.h b/libviengoos/viengoos/misc.h
index a793335..9fa7131 100644
--- a/libviengoos/viengoos/misc.h
+++ b/libviengoos/viengoos/misc.h
@@ -30,68 +30,68 @@
 
 enum rm_method_id
   {
-    RM_write = 100,
-    RM_read,
-    RM_as_dump,
-    RM_fault,
+    VG_write = 100,
+    VG_read,
+    VG_as_dump,
+    VG_fault,
   };
 
 static inline const char *
-rm_method_id_string (int id)
+vg_method_id_string (int id)
 {
   switch (id)
     {
-    case RM_write:
+    case VG_write:
       return "write";
-    case RM_read:
+    case VG_read:
       return "read";
-    case RM_as_dump:
+    case VG_as_dump:
       return "as_dump";
-    case RM_fault:
+    case VG_fault:
       return "fault";
-    case RM_folio_alloc:
+    case VG_folio_alloc:
       return "folio_alloc";
-    case RM_folio_free:
+    case VG_folio_free:
       return "folio_free";
-    case RM_folio_object_alloc:
+    case VG_folio_object_alloc:
       return "folio_object_alloc";
-    case RM_folio_policy:
+    case VG_folio_policy:
       return "folio_policy";
-    case RM_cap_copy:
+    case VG_cap_copy:
       return "cap_copy";
-    case RM_cap_rubout:
+    case VG_cap_rubout:
       return "cap_rubout";
-    case RM_cap_read:
+    case VG_cap_read:
       return "cap_read";
-    case RM_object_discarded_clear:
+    case VG_object_discarded_clear:
       return "object_discarded_clear";
-    case RM_object_discard:
+    case VG_object_discard:
       return "object_discard";
-    case RM_object_status:
+    case VG_object_status:
       return "object_status";
-    case RM_object_reply_on_destruction:
+    case VG_object_reply_on_destruction:
       return "object_reply_on_destruction";
-    case RM_object_name:
+    case VG_object_name:
       return "object_name";
-    case RM_thread_exregs:
+    case VG_thread_exregs:
       return "thread_exregs";
-    case RM_thread_id:
+    case VG_thread_id:
       return "thread_id";
-    case RM_thread_activation_collect:
+    case VG_thread_activation_collect:
       return "thread_activation_collect";
-    case RM_activity_policy:
+    case VG_activity_policy:
       return "activity_policy";
-    case RM_activity_info:
+    case VG_activity_info:
       return "activity_info";
-    case RM_futex:
+    case VG_futex:
       return "futex";
     default:
       return "unknown method id";
     }
 }
 
-#define RPC_STUB_PREFIX rm
-#define RPC_ID_PREFIX RM
+#define RPC_STUB_PREFIX vg
+#define RPC_ID_PREFIX VG
 
 #include <viengoos/rpc.h>
 
diff --git a/libviengoos/viengoos/thread.h b/libviengoos/viengoos/thread.h
index f076687..2c95f49 100644
--- a/libviengoos/viengoos/thread.h
+++ b/libviengoos/viengoos/thread.h
@@ -169,9 +169,9 @@ enum
 
 enum
   {
-    RM_thread_exregs = 600,
-    RM_thread_id,
-    RM_thread_activation_collect,
+    VG_thread_exregs = 600,
+    VG_thread_id,
+    VG_thread_activation_collect,
   };
 
 #ifdef RM_INTERN
@@ -181,8 +181,8 @@ typedef struct thread *vg_thread_t;
 typedef vg_addr_t vg_thread_t;
 #endif
 
-#define RPC_STUB_PREFIX rm
-#define RPC_ID_PREFIX RM
+#define RPC_STUB_PREFIX vg
+#define RPC_ID_PREFIX VG
 
 #include <viengoos/rpc.h>
 
@@ -221,7 +221,7 @@ vg_thread_start (vg_addr_t thread)
   struct hurd_thread_exregs_in in;
   struct hurd_thread_exregs_out out;
 
-  return rm_thread_exregs (VG_ADDR_VOID, thread,
+  return vg_thread_exregs (VG_ADDR_VOID, thread,
 			   HURD_EXREGS_START | HURD_EXREGS_ABORT_IPC,
 			   in, VG_ADDR_VOID, VG_ADDR_VOID, VG_ADDR_VOID, VG_ADDR_VOID,
 			   &out, NULL, NULL, NULL, NULL);
@@ -236,7 +236,7 @@ vg_thread_start_sp_ip (vg_addr_t thread, uintptr_t sp, uintptr_t ip)
   in.sp = sp;
   in.ip = ip;
 
-  return rm_thread_exregs (VG_ADDR_VOID, thread,
+  return vg_thread_exregs (VG_ADDR_VOID, thread,
 			   HURD_EXREGS_START | HURD_EXREGS_ABORT_IPC
 			   | HURD_EXREGS_SET_SP_IP,
 			   in, VG_ADDR_VOID, VG_ADDR_VOID, VG_ADDR_VOID, VG_ADDR_VOID,
@@ -249,7 +249,7 @@ vg_thread_stop (vg_addr_t thread)
   struct hurd_thread_exregs_in in;
   struct hurd_thread_exregs_out out;
 
-  return rm_thread_exregs (VG_ADDR_VOID, thread,
+  return vg_thread_exregs (VG_ADDR_VOID, thread,
 			   HURD_EXREGS_STOP | HURD_EXREGS_ABORT_IPC,
 			   in, VG_ADDR_VOID, VG_ADDR_VOID, VG_ADDR_VOID, VG_ADDR_VOID,
 			   &out, NULL, NULL, NULL, NULL);
@@ -271,7 +271,7 @@ static inline vg_thread_id_t
 vg_myself (void)
 {
   vg_thread_id_t tid;
-  error_t err = rm_thread_id (VG_ADDR_VOID, VG_ADDR_VOID, &tid);
+  error_t err = vg_thread_id (VG_ADDR_VOID, VG_ADDR_VOID, &tid);
   if (err)
     return vg_niltid;
   return tid;