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.

7 files changed, 21 insertions, 21 deletions

diff --git a/libhurd-mm/anonymous.c b/libhurd-mm/anonymous.c
index 8bb91d3..e90ad04 100644
--- a/libhurd-mm/anonymous.c
+++ b/libhurd-mm/anonymous.c
@@ -253,7 +253,7 @@ fault (struct pager *pager, uintptr_t offset, int count, bool read_only,
 		 storage address as object_discarded_clear also
 		 returns a mapping and we are likely to access the
 		 data at the fault address.  */
-	      err = rm_object_discarded_clear (VG_ADDR_VOID, VG_ADDR_VOID,
+	      err = vg_object_discarded_clear (VG_ADDR_VOID, VG_ADDR_VOID,
 					       storage_desc->storage);
 	      assertx (err == 0, "%d", err);
 
@@ -327,7 +327,7 @@ fault (struct pager *pager, uintptr_t offset, int count, bool read_only,
       int faulted;
       for (i = 0; i < count; i += faulted)
 	{
-	  error_t err = rm_fault (VG_ADDR_VOID, fault_addr + i * PAGESIZE,
+	  error_t err = vg_fault (VG_ADDR_VOID, fault_addr + i * PAGESIZE,
 				  count - i, &faulted);
 	  if (err || faulted == 0)
 	    break;
@@ -544,7 +544,7 @@ advise (struct pager *pager,
 		    break;
 
 		  error_t err;
-		  err = rm_object_discard (anon->activity,
+		  err = vg_object_discard (anon->activity,
 					   storage_desc->storage);
 		  if (err)
 		    panic ("err: %d", err);
diff --git a/libhurd-mm/as-build.c b/libhurd-mm/as-build.c
index c850713..73df82f 100644
--- a/libhurd-mm/as-build.c
+++ b/libhurd-mm/as-build.c
@@ -86,7 +86,7 @@ struct trace_buffer as_trace = TRACE_BUFFER_INIT ("as_trace", 0,
 #ifdef RM_INTERN
 # define AS_DUMP as_dump_from (activity, as_root, __func__)
 #else
-# define AS_DUMP rm_as_dump (VG_ADDR_VOID, as_root_addr)
+# define AS_DUMP vg_as_dump (VG_ADDR_VOID, as_root_addr)
 #endif
 
 /* The following macros allow providing specialized address-space
diff --git a/libhurd-mm/as.c b/libhurd-mm/as.c
index 7e47727..e179796 100644
--- a/libhurd-mm/as.c
+++ b/libhurd-mm/as.c
@@ -437,7 +437,7 @@ as_alloc_slow (int width)
 
   struct vg_cap_properties properties = VG_CAP_PROPERTIES_DEFAULT;
   VG_CAP_ADDR_TRANS_SET_GUARD (&properties.addr_trans, 0, gbits);
-  err = rm_cap_copy (meta_data_activity, VG_ADDR_VOID, slot, VG_ADDR_VOID, slot,
+  err = vg_cap_copy (meta_data_activity, VG_ADDR_VOID, slot, VG_ADDR_VOID, slot,
 		     VG_CAP_COPY_COPY_ADDR_TRANS_GUARD, properties);
   if (err)
     panic ("failed to copy capability: %d", err);
@@ -504,11 +504,11 @@ as_init (void)
 
       uintptr_t type;
       struct vg_cap_properties properties;
-      err = rm_cap_read (meta_data_activity, VG_ADDR_VOID, addr,
+      err = vg_cap_read (meta_data_activity, VG_ADDR_VOID, addr,
 			 &type, &properties);
       assert (! err);
       if (! vg_cap_types_compatible (type, desc->type))
-	rm_as_dump (VG_ADDR_VOID, VG_ADDR_VOID);
+	vg_as_dump (VG_ADDR_VOID, VG_ADDR_VOID);
       assertx (vg_cap_types_compatible (type, desc->type),
 	       "Object at " VG_ADDR_FMT ": %s != %s",
 	       VG_ADDR_PRINTF (addr),
@@ -757,7 +757,7 @@ as_walk (int (*visit) (vg_addr_t addr,
       struct vg_cap_properties root_properties;
       uintptr_t root_type;
 
-      err = rm_cap_read (meta_data_activity, VG_ADDR_VOID,
+      err = vg_cap_read (meta_data_activity, VG_ADDR_VOID,
 			 VG_ADDR (0, 0), &root_type, &root_properties);
       assert (err == 0);
 
@@ -779,7 +779,7 @@ as_walk (int (*visit) (vg_addr_t addr,
 	    }
 	  else
 	    {
-	      err = rm_cap_read (meta_data_activity, VG_ADDR_VOID,
+	      err = vg_cap_read (meta_data_activity, VG_ADDR_VOID,
 				 addr, &type, &properties);
 	      assert (err == 0);
 	    }
@@ -832,14 +832,14 @@ as_walk (int (*visit) (vg_addr_t addr,
 	    }
 
 	  addr = vg_addr_extend (addr, child[d], slots_log2);
-	  err = rm_cap_read (meta_data_activity, VG_ADDR_VOID,
+	  err = vg_cap_read (meta_data_activity, VG_ADDR_VOID,
 			     addr, &type, &properties);
 	  assert (err == 0);
 	}
 
       for (;;)
 	{
-	  err = rm_cap_read (meta_data_activity, VG_ADDR_VOID,
+	  err = vg_cap_read (meta_data_activity, VG_ADDR_VOID,
 			     addr, &type, &properties);
 	  if (err)
 	    /* Dangling pointer.  */
diff --git a/libhurd-mm/as.h b/libhurd-mm/as.h
index 7bc4cce..d3253f8 100644
--- a/libhurd-mm/as.h
+++ b/libhurd-mm/as.h
@@ -203,7 +203,7 @@ extern struct vg_cap shadow_root;
       struct vg_cap_properties __acs_p;					\
       error_t __acs_err;						\
 									\
-      __acs_err = rm_cap_read (meta_data_activity,			\
+      __acs_err = vg_cap_read (meta_data_activity,			\
 			       (__acs_root_addr), (__acs_addr),		\
 			       &__acs_type, &__acs_p);			\
 									\
diff --git a/libhurd-mm/exceptions.c b/libhurd-mm/exceptions.c
index c73bec6..13827f2 100644
--- a/libhurd-mm/exceptions.c
+++ b/libhurd-mm/exceptions.c
@@ -523,7 +523,7 @@ hurd_activation_handler_activated (struct hurd_utcb *utcb)
 	    err = vg_message_word (mb->reply, 0);
 
 	  debug (5, "Extant RPC: %s (%d) -> %d",
-		 rm_method_id_string (label), label, err);
+		 vg_method_id_string (label), label, err);
 	}
 #endif
 
@@ -857,7 +857,7 @@ hurd_activation_state_alloc (vg_addr_t thread, struct hurd_utcb **utcbp)
   struct hurd_thread_exregs_in in;
   struct hurd_thread_exregs_out out;
 
-  err = rm_thread_exregs (VG_ADDR_VOID, thread,
+  err = vg_thread_exregs (VG_ADDR_VOID, thread,
 			  HURD_EXREGS_SET_UTCB
 			  | HURD_EXREGS_SET_EXCEPTION_MESSENGER,
 			  in, VG_ADDR_VOID, VG_ADDR_VOID,
@@ -866,7 +866,7 @@ hurd_activation_state_alloc (vg_addr_t thread, struct hurd_utcb **utcbp)
   if (err)
     panic ("Failed to install utcb");
 
-  err = rm_cap_copy (VG_ADDR_VOID,
+  err = vg_cap_copy (VG_ADDR_VOID,
 		     utcb->exception_buffer->receiver,
 		     VG_ADDR (VG_MESSENGER_THREAD_SLOT, VG_MESSENGER_SLOTS_LOG2),
 		     VG_ADDR_VOID, thread,
diff --git a/libhurd-mm/mprotect.c b/libhurd-mm/mprotect.c
index 5c70427..59d25e9 100644
--- a/libhurd-mm/mprotect.c
+++ b/libhurd-mm/mprotect.c
@@ -138,7 +138,7 @@ mprotect (void *addr, size_t length, int prot)
 		     if (map->access == 0)
 		       {
 			 error_t err;
-			 err = rm_cap_rubout (meta_data_activity,
+			 err = vg_cap_rubout (meta_data_activity,
 					      VG_ADDR_VOID, addr);
 			 assert (! err);
 			 slot->type = vg_cap_void;
diff --git a/libhurd-mm/storage.c b/libhurd-mm/storage.c
index bdb6ce0..388603d 100644
--- a/libhurd-mm/storage.c
+++ b/libhurd-mm/storage.c
@@ -253,7 +253,7 @@ shadow_setup (struct vg_cap *cap, struct storage_desc *desc)
       desc->free --;
       atomic_decrement (&free_count);
 
-      error_t err = rm_folio_object_alloc (meta_data_activity,
+      error_t err = vg_folio_object_alloc (meta_data_activity,
 					   desc->folio, idx, vg_cap_page,
 					   VG_OBJECT_POLICY_DEFAULT, 0,
 					   NULL, NULL);
@@ -465,7 +465,7 @@ storage_check_reserve_internal (bool force_allocate,
 
   /* And then the folio.  */
   vg_addr_t a = addr;
-  error_t err = rm_folio_alloc (activity, activity, VG_FOLIO_POLICY_DEFAULT,
+  error_t err = vg_folio_alloc (activity, activity, VG_FOLIO_POLICY_DEFAULT,
 				&a);
   assert (! err);
   assert (VG_ADDR_EQ (addr, a));
@@ -645,7 +645,7 @@ storage_alloc (vg_addr_t activity,
     }
 
   vg_addr_t a = addr;
-  error_t err = rm_folio_object_alloc (activity, folio, idx, type, policy, 0,
+  error_t err = vg_folio_object_alloc (activity, folio, idx, type, policy, 0,
 				       &a, NULL);
   assertx (! err,
 	   "Allocating object %d from " VG_ADDR_FMT " at " VG_ADDR_FMT ": %d!",
@@ -752,7 +752,7 @@ storage_free_ (vg_addr_t object, bool unmap_now)
 	  ss_mutex_unlock (&storage_descs_lock);
 
 
-	  error_t err = rm_folio_free (meta_data_activity, folio);
+	  error_t err = vg_folio_free (meta_data_activity, folio);
 	  assert (err == 0);
 
 	  as_slot_lookup_use (folio,
@@ -806,7 +806,7 @@ storage_free_ (vg_addr_t object, bool unmap_now)
   int idx = vg_addr_extract (object, VG_FOLIO_OBJECTS_LOG2);
   bit_dealloc (storage->alloced, idx);
 
-  error_t err = rm_folio_object_alloc (meta_data_activity,
+  error_t err = vg_folio_object_alloc (meta_data_activity,
 				       folio, idx, vg_cap_void,
 				       VG_OBJECT_POLICY_DEFAULT, 0,
 				       NULL, NULL);