Add vg_ prefix to the (hopefully) remaining viengoos symbols.

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

	* viengoos/activity.h (struct activity_memory_policy): Rename from
	this...
	(struct vg_activity_memory_policy): ... to this.  Update users.
	(struct activity_policy): Rename from this...
	(struct vg_activity_policy): ... to this.  Update users.
	(ACTIVITY_STATS_PERIODS): Rename from this...
	(VG_ACTIVITY_STATS_PERIODS): ... to this.  Update users.
	(struct activity_stats): Rename from this...
	(struct vg_activity_stats): ... to this.  Update users.
	(struct activity_info): Rename from this...
	(struct vg_activity_info): ... to this.  Update users.
	* viengoos/addr.h (struct addr): Rename from this...
	(struct vg_addr): ... to this.  Update users.
	* viengoos/cap.h (struct object_policy): Rename from this...
	(struct vg_object_policy): ... to this.  Update users.
	(struct object_name): Rename from this...
	(struct vg_object_name): ... to this.  Update users.
	(struct object): Rename from this...
	(struct vg_object): ... to this.  Update users.
	* viengoos/folio.h (struct folio_policy): Rename from this...
	(struct vg_folio_policy): ... to this.  Update users.
	(struct folio): Rename for this...
	(struct vg_folio): ... to this.  Update users.
	* viengoos/thread.h
	(HURD_EXREGS_SET_UTCB): Rename from this...
	(VG_EXREGS_SET_UTCB): ... to this.  Update users.
	(HURD_EXREGS_SET_EXCEPTION_MESSENGER): Rename from this...
	(VG_EXREGS_SET_EXCEPTION_MESSENGER): ... to this.  Update users.
	(HURD_EXREGS_SET_ASPACE): Rename from this...
	(VG_EXREGS_SET_ASPACE): ... to this.  Update users.
	(HURD_EXREGS_SET_ACTIVITY): Rename from this...
	(VG_EXREGS_SET_ACTIVITY): ... to this.  Update users.
	(HURD_EXREGS_SET_SP): Rename from this...
	(VG_EXREGS_SET_SP): ... to this.  Update users.
	(HURD_EXREGS_SET_IP): Rename from this...
	(VG_EXREGS_SET_IP): ... to this.  Update users.
	(HURD_EXREGS_SET_SP_IP): Rename from this...
	(VG_EXREGS_SET_SP_IP): ... to this.  Update users.
	(HURD_EXREGS_SET_EFLAGS): Rename from this...
	(VG_EXREGS_SET_EFLAGS): ... to this.  Update users.
	(HURD_EXREGS_SET_USER_HANDLE): Rename from this...
	(VG_EXREGS_SET_USER_HANDLE): ... to this.  Update users.
	(HURD_EXREGS_SET_REGS): Rename from this...
	(VG_EXREGS_SET_REGS): ... to this.  Update users.
	(HURD_EXREGS_GET_REGS): Rename from this...
	(VG_EXREGS_GET_REGS): ... to this.  Update users.
	(HURD_EXREGS_START): Rename from this...
	(VG_EXREGS_START): ... to this.  Update users.
	(HURD_EXREGS_STOP): Rename from this...
	(VG_EXREGS_STOP): ... to this.  Update users.
	(HURD_EXREGS_ABORT_SEND): Rename from this...
	(VG_EXREGS_ABORT_SEND): ... to this.  Update users.
	(HURD_EXREGS_ABORT_RECEIVE): Rename from this...
	(VG_EXREGS_ABORT_RECEIVE): ... to this.  Update users.
	(HURD_EXREGS_ABORT_IPC): Rename from this...
	(VG_EXREGS_ABORT_IPC): ... to this.  Update users.
	(struct hurd_thread_exregs_in): Rename form this...
	(struct vg_thread_exregs_in): ... to this.  Update users.
	(struct hurd_thread_exregs_out): Rename form this...
	(struct vg_thread_exregs_out): ... to this.  Update users.
	(RPC_STUB_PREFIX): Define to vg_activation.  Update users.
	(RPC_ID_PREFIX): Define to VG_ACTIVATION.  Update users.
	(ACTIVATION_fault): Rename from this...
	(VG_ACTIVATION_fault): ... to this.  Update users.

12 files changed, 59 insertions, 58 deletions

diff --git a/libhurd-mm/anonymous.c b/libhurd-mm/anonymous.c
index e90ad04..dac8309 100644
--- a/libhurd-mm/anonymous.c
+++ b/libhurd-mm/anonymous.c
@@ -579,7 +579,7 @@ advise (struct pager *pager,
 struct anonymous_pager *
 anonymous_pager_alloc (vg_addr_t activity,
 		       void *hint, uintptr_t length, enum map_access access,
-		       struct object_policy policy,
+		       struct vg_object_policy policy,
 		       uintptr_t flags, anonymous_pager_fill_t fill,
 		       void **addr_out)
 {
diff --git a/libhurd-mm/anonymous.h b/libhurd-mm/anonymous.h
index bdc71ec..28d1b9a 100644
--- a/libhurd-mm/anonymous.h
+++ b/libhurd-mm/anonymous.h
@@ -117,7 +117,7 @@ struct anonymous_pager
   vg_addr_t activity;
 
   /* The policy to use when allocating memory.  */
-  struct object_policy policy;
+  struct vg_object_policy policy;
 
 
   /* If not NULL, called when a fault is raised due to lack of storage
@@ -167,7 +167,7 @@ extern struct anonymous_pager *anonymous_pager_alloc (vg_addr_t activity,
 						      void *addr_hint,
 						      uintptr_t length,
 						      enum map_access access,
-						      struct object_policy p,
+						      struct vg_object_policy p,
 						      uintptr_t flags,
 						      anonymous_pager_fill_t f,
 						      void **addr_out);
diff --git a/libhurd-mm/as-build-custom.c b/libhurd-mm/as-build-custom.c
index 96efe3d..3bed8ff 100644
--- a/libhurd-mm/as-build-custom.c
+++ b/libhurd-mm/as-build-custom.c
@@ -29,7 +29,7 @@
 #include "as-build.c"
 
 struct vg_cap *
-as_ensure_full_custom (activity_t activity,
+as_ensure_full_custom (vg_activity_t activity,
 		       vg_addr_t as_root_addr, struct vg_cap *root, vg_addr_t addr,
 		       as_allocate_page_table_t as_allocate_page_table,
 		       as_object_index_t object_index)
@@ -40,7 +40,7 @@ as_ensure_full_custom (activity_t activity,
 }
 
 struct vg_cap *
-as_insert_custom (activity_t activity,
+as_insert_custom (vg_activity_t activity,
 		  vg_addr_t as_root_addr, struct vg_cap *root, vg_addr_t addr,
 		  vg_addr_t entry_as, struct vg_cap entry, vg_addr_t entry_addr,
 		  as_allocate_page_table_t as_allocate_page_table,
diff --git a/libhurd-mm/as-build.c b/libhurd-mm/as-build.c
index 73df82f..5097117 100644
--- a/libhurd-mm/as-build.c
+++ b/libhurd-mm/as-build.c
@@ -122,7 +122,7 @@ struct trace_buffer as_trace = TRACE_BUFFER_INIT ("as_trace", 0,
    implicit (in the case of a folio), return a fabricated capability
    in *FAKE_SLOT and return FAKE_SLOT.  Return NULL on failure.  */
 static inline struct vg_cap *
-do_index (activity_t activity, struct vg_cap *pte, vg_addr_t pt_addr, int idx,
+do_index (vg_activity_t activity, struct vg_cap *pte, vg_addr_t pt_addr, int idx,
 	  struct vg_cap *fake_slot)
 {
   assert (pte->type == vg_cap_cappage || pte->type == vg_cap_rcappage
@@ -131,7 +131,7 @@ do_index (activity_t activity, struct vg_cap *pte, vg_addr_t pt_addr, int idx,
 	  || pte->type == vg_cap_messenger || pte->type == vg_cap_rmessenger);
 
   /* Load the referenced object.  */
-  struct object *pt = vg_cap_to_object (activity, pte);
+  struct vg_object *pt = vg_cap_to_object (activity, pte);
   if (! pt)
     /* PTE's type was not void but its designation was invalid.  This
        can only happen if we inserted an object and subsequently
@@ -149,7 +149,7 @@ do_index (activity_t activity, struct vg_cap *pte, vg_addr_t pt_addr, int idx,
       return &pt->caps[VG_CAP_SUBPAGE_OFFSET (pte) + idx];
 
     case vg_cap_folio:;
-      struct folio *folio = (struct folio *) pt;
+      struct vg_folio *folio = (struct vg_folio *) pt;
 
       if (vg_folio_object_type (folio, idx) == vg_cap_void)
 	PANIC ("Can't use void object at " VG_ADDR_FMT " for address translation",
@@ -188,7 +188,7 @@ do_index (activity_t activity, struct vg_cap *pte, vg_addr_t pt_addr, int idx,
    capability.  Otherwise, only capability slots containing a void
    capability are used.  */
 struct vg_cap *
-ID (as_build) (activity_t activity,
+ID (as_build) (vg_activity_t activity,
 	       vg_addr_t as_root_addr, struct vg_cap *as_root, vg_addr_t addr,
 	       as_allocate_page_table_t allocate_page_table
 	       OBJECT_INDEX_PARAM,
diff --git a/libhurd-mm/as-dump.c b/libhurd-mm/as-dump.c
index 68051ae..c802a93 100644
--- a/libhurd-mm/as-dump.c
+++ b/libhurd-mm/as-dump.c
@@ -66,7 +66,7 @@ print_nr (int width, int64_t nr, bool hex)
 }
 
 static void
-do_walk (activity_t activity, int index,
+do_walk (vg_activity_t activity, int index,
 	 struct vg_cap *root, vg_addr_t addr,
 	 int indent, bool descend, const char *output_prefix)
 {
@@ -115,7 +115,7 @@ do_walk (activity_t activity, int index,
 #ifdef RM_INTERN
   if (vg_cap.type == vg_cap_page || vg_cap.type == vg_cap_rpage)
     {
-      struct object *object = cap_to_object_soft (root_activity, &vg_cap);
+      struct vg_object *object = cap_to_object_soft (root_activity, &vg_cap);
       if (object)
 	{
 	  struct md5_ctx ctx;
@@ -207,7 +207,7 @@ do_walk (activity_t activity, int index,
 
 /* AS_LOCK must not be held.  */
 void
-as_dump_from (activity_t activity, struct vg_cap *root, const char *prefix)
+as_dump_from (vg_activity_t activity, struct vg_cap *root, const char *prefix)
 {
   debug (0, "Dumping address space.");
   backtrace_print ();
diff --git a/libhurd-mm/as-lookup.c b/libhurd-mm/as-lookup.c
index 38b7072..e565e7c 100644
--- a/libhurd-mm/as-lookup.c
+++ b/libhurd-mm/as-lookup.c
@@ -58,7 +58,7 @@
 #endif
 
 static bool
-as_lookup_rel_internal (activity_t activity,
+as_lookup_rel_internal (vg_activity_t activity,
 			struct vg_cap *root, vg_addr_t address,
 			enum vg_cap_type type, bool *writable,
 			enum as_lookup_mode mode, union as_lookup_ret *rt,
@@ -185,7 +185,7 @@ as_lookup_rel_internal (activity_t activity,
 		DUMP_OR_RET (false);
 	      }
 
-	    struct object *object = vg_cap_to_object (activity, root);
+	    struct vg_object *object = vg_cap_to_object (activity, root);
 	    if (! object)
 	      {
 #ifdef RM_INTERN
@@ -219,7 +219,7 @@ as_lookup_rel_internal (activity_t activity,
 	      DUMP_OR_RET (false);
 	    }
 
-	  struct object *object = vg_cap_to_object (activity, root);
+	  struct vg_object *object = vg_cap_to_object (activity, root);
 	  if (! object)
 	      {
 #ifdef RM_INTERN
@@ -229,7 +229,7 @@ as_lookup_rel_internal (activity_t activity,
 		DUMP_OR_RET (false);
 	      }
 
-	  struct folio *folio = (struct folio *) object;
+	  struct vg_folio *folio = (struct vg_folio *) object;
 
 	  int i = extract_bits64_inv (addr, remaining - 1, VG_FOLIO_OBJECTS_LOG2);
 #ifdef RM_INTERN
@@ -274,7 +274,7 @@ as_lookup_rel_internal (activity_t activity,
 		DUMP_OR_RET (false);
 	      }
 
-	    struct object *object = vg_cap_to_object (activity, root);
+	    struct vg_object *object = vg_cap_to_object (activity, root);
 	    if (! object)
 	      {
 #ifdef RM_INTERN
@@ -391,7 +391,7 @@ as_lookup_rel_internal (activity_t activity,
 }
 
 bool
-as_lookup_rel (activity_t activity,
+as_lookup_rel (vg_activity_t activity,
 	       struct vg_cap *root, vg_addr_t address,
 	       enum vg_cap_type type, bool *writable,
 	       enum as_lookup_mode mode, union as_lookup_ret *rt)
@@ -412,7 +412,7 @@ as_lookup_rel (activity_t activity,
 }
 
 void
-as_dump_path_rel (activity_t activity, struct vg_cap *root, vg_addr_t addr)
+as_dump_path_rel (vg_activity_t activity, struct vg_cap *root, vg_addr_t addr)
 {
   union as_lookup_ret rt;
 
diff --git a/libhurd-mm/as.c b/libhurd-mm/as.c
index a654e3e..1a291db 100644
--- a/libhurd-mm/as.c
+++ b/libhurd-mm/as.c
@@ -555,7 +555,7 @@ as_init (void)
 			     VG_OBJECT_POLICY_DEFAULT, VG_ADDR_VOID);
 	  if (VG_ADDR_IS_VOID (shadow_storage.addr))
 	    panic ("Out of space.");
-	  struct object *shadow
+	  struct vg_object *shadow
 	    = VG_ADDR_TO_PTR (vg_addr_extend (shadow_storage.addr,
 					0, PAGESIZE_LOG2));
 	  as_slot_lookup_use (addr,
@@ -981,7 +981,7 @@ as_walk (int (*visit) (vg_addr_t addr,
       if (vg_addr_depth (addr) + slots_log2 > VG_ADDR_BITS)
 	return 0;
 
-      struct object *shadow = NULL;
+      struct vg_object *shadow = NULL;
       if (as_init_done)
 	shadow = vg_cap_to_object (meta_data_activity, cap);
 
diff --git a/libhurd-mm/as.h b/libhurd-mm/as.h
index 812693d..24f8f3e 100644
--- a/libhurd-mm/as.h
+++ b/libhurd-mm/as.h
@@ -183,7 +183,7 @@ as_unlock (void)
    running in a particular address space, all metadata is built from a
    single activity.  This should dominate all activities running in
    this address space to avoid priority inversion.  */
-extern activity_t meta_data_activity;
+extern vg_activity_t meta_data_activity;
 
 /* The root of the shadow page tables.  */
 extern struct vg_cap shadow_root;
@@ -293,7 +293,7 @@ extern struct as_allocate_pt_ret as_allocate_page_table (vg_addr_t addr);
 
    Must be called with a write lock on AS_LOCK.  Must be called with
    8kb of stack that will not fault.  */
-struct vg_cap *as_build (activity_t activity,
+struct vg_cap *as_build (vg_activity_t activity,
 		      vg_addr_t as_root_addr, struct vg_cap *as_root_cap,
 		      vg_addr_t addr,
 		      as_allocate_page_table_t allocate_page_table,
@@ -305,14 +305,14 @@ struct vg_cap *as_build (activity_t activity,
    is implicit (in the case of a folio), return a fabricated
    capability in *FAKE_SLOT and return FAKE_SLOT.  Return NULL on
    failure.  */
-typedef struct vg_cap *(*as_object_index_t) (activity_t activity,
+typedef struct vg_cap *(*as_object_index_t) (vg_activity_t activity,
 					  struct vg_cap *pt,
 					  vg_addr_t pt_addr, int idx,
 					  struct vg_cap *fake_slot);
 
 /* Like as_buildup, but using a custom shadow page table
    implementation.  */
-struct vg_cap *as_build_custom (activity_t activity,
+struct vg_cap *as_build_custom (vg_activity_t activity,
 			     vg_addr_t as_root_addr, struct vg_cap *as_root_cap,
 			     vg_addr_t addr,
 			     as_allocate_page_table_t allocate_page_table,
@@ -332,7 +332,7 @@ struct vg_cap *as_build_custom (activity_t activity,
 		       __asef_code)					\
   do									\
     {									\
-      activity_t __asef_activity = (__asef_activity_);			\
+      vg_activity_t __asef_activity = (__asef_activity_);			\
       vg_addr_t __asef_as_root_addr = (__asef_as_root_addr_);		\
       struct vg_cap *__asef_as_root_cap = (__asef_as_root_cap_);		\
       vg_addr_t __asef_addr = (__asef_addr_);				\
@@ -395,7 +395,7 @@ struct vg_cap *as_build_custom (activity_t activity,
    ALLOCATE_PAGE_TABLE is a callback to allocate page tables and any
    accompanying shadow page tables.  See as_build for details.  */
 static inline void
-as_insert_full (activity_t activity,
+as_insert_full (vg_activity_t activity,
 		vg_addr_t target_as_root_addr, struct vg_cap *target_as_root_cap,
 		vg_addr_t target_addr,
 		vg_addr_t source_as_root_addr, 
@@ -445,7 +445,7 @@ as_insert (vg_addr_t target_addr,
 /* Variant of as_ensure_full that doesn't assume the default shadow
    page table format but calls OBJECT_INDEX to index objects.  */
 extern struct vg_cap *as_ensure_full_custom
-  (activity_t activity,
+  (vg_activity_t activity,
    vg_addr_t as, struct vg_cap *root, vg_addr_t addr,
    as_allocate_page_table_t allocate_page_table,
    as_object_index_t object_index);
@@ -453,7 +453,7 @@ extern struct vg_cap *as_ensure_full_custom
 /* Variant of as_insert that doesn't assume the default shadow page
    table format but calls OBJECT_INDEX to index objects.  */
 extern struct vg_cap *as_insert_custom
-  (activity_t activity,
+  (vg_activity_t activity,
    vg_addr_t target_as, struct vg_cap *t_as_cap, vg_addr_t target,
    vg_addr_t source_as, struct vg_cap c_cap, vg_addr_t source,
    as_allocate_page_table_t allocate_page_table,
@@ -495,7 +495,7 @@ enum as_lookup_mode
 
    On success, whether the slot or the object is writable is returned
    in *WRITABLE.  */
-extern bool as_lookup_rel (activity_t activity,
+extern bool as_lookup_rel (vg_activity_t activity,
 			   struct vg_cap *as_root_cap, vg_addr_t addr,
 			   enum vg_cap_type type, bool *writable,
 			   enum as_lookup_mode mode,
@@ -511,7 +511,7 @@ extern bool as_lookup_rel (activity_t activity,
 			       __alru_root_, __alru_addr_,		\
 			       __alru_code)				\
   ({									\
-    activity_t __alru_activity = (__alru_activity_);			\
+    vg_activity_t __alru_activity = (__alru_activity_);			\
     struct vg_cap *__alru_root = (__alru_root_);				\
     vg_addr_t __alru_addr = (__alru_addr_);				\
 									\
@@ -558,7 +558,7 @@ extern bool as_lookup_rel (activity_t activity,
 
    This function locks (and unlocks) as_lock.  */
 static inline struct vg_cap
-as_cap_lookup_rel (activity_t activity,
+as_cap_lookup_rel (vg_activity_t activity,
 		   struct vg_cap *root, vg_addr_t addr,
 		   enum vg_cap_type type, bool *writable)
 {
@@ -603,7 +603,7 @@ as_cap_lookup (vg_addr_t addr, enum vg_cap_type type, bool *writable)
 
    This function locks (and unlocks) as_lock.  */
 static inline struct vg_cap
-as_object_lookup_rel (activity_t activity,
+as_object_lookup_rel (vg_activity_t activity,
 		      struct vg_cap *root, vg_addr_t addr,
 		      enum vg_cap_type type, bool *writable)
 {
@@ -636,7 +636,7 @@ as_object_lookup (vg_addr_t addr, enum vg_cap_type type, bool *writable)
 #endif
 
 /* Print the path taken to get to the slot at address ADDRESS.  */
-extern void as_dump_path_rel (activity_t activity,
+extern void as_dump_path_rel (vg_activity_t activity,
 			      struct vg_cap *root, vg_addr_t addr);
 
 #ifndef RM_INTERN
@@ -663,7 +663,7 @@ extern int as_walk (int (*visit) (vg_addr_t cap,
 		    void *cookie);
 
 /* AS_LOCK must not be held.  */
-extern void as_dump_from (activity_t activity, struct vg_cap *root,
+extern void as_dump_from (vg_activity_t activity, struct vg_cap *root,
 			  const char *prefix);
 
 #ifndef RM_INTERN
diff --git a/libhurd-mm/capalloc.c b/libhurd-mm/capalloc.c
index 56715e4..7096a65 100644
--- a/libhurd-mm/capalloc.c
+++ b/libhurd-mm/capalloc.c
@@ -196,8 +196,9 @@ capalloc (void)
 	  return VG_ADDR_VOID;
 	}
 
-      struct object *shadow = VG_ADDR_TO_PTR (vg_addr_extend (shadow_storage.addr,
-							0, PAGESIZE_LOG2));
+      struct vg_object *shadow
+	= VG_ADDR_TO_PTR (vg_addr_extend (shadow_storage.addr,
+					  0, PAGESIZE_LOG2));
       memset (shadow, 0, PAGESIZE);
       vg_cap_set_shadow (area->cap, shadow);
 
@@ -270,7 +271,7 @@ capfree (vg_addr_t cap)
 	  list_unlink (desc);
 	  pthread_mutex_unlock (&cappage_descs_lock);
 
-	  struct object *shadow = vg_cap_get_shadow (desc->cap);
+	  struct vg_object *shadow = vg_cap_get_shadow (desc->cap);
 	  storage_free (vg_addr_chop (VG_PTR_TO_ADDR (shadow), PAGESIZE_LOG2),
 			false);
 	  vg_cap_set_shadow (desc->cap, NULL);
diff --git a/libhurd-mm/exceptions.c b/libhurd-mm/exceptions.c
index e7a923c..39d972f 100644
--- a/libhurd-mm/exceptions.c
+++ b/libhurd-mm/exceptions.c
@@ -339,7 +339,7 @@ hurd_activation_handler_normal (struct activation_frame *activation_frame,
       uintptr_t label = vg_message_word (mb->reply, 0);
       switch (label)
 	{
-	case ACTIVATION_fault:
+	case VG_ACTIVATION_fault:
 	  {
 	    vg_addr_t fault;
 	    uintptr_t ip;
@@ -347,9 +347,9 @@ hurd_activation_handler_normal (struct activation_frame *activation_frame,
 	    struct vg_activation_fault_info info;
 
 	    error_t err;
-	    err = activation_fault_send_unmarshal (mb->reply,
-						   &fault, &sp, &ip, &info,
-						   NULL);
+	    err = vg_activation_fault_send_unmarshal (mb->reply,
+						      &fault, &sp, &ip, &info,
+						      NULL);
 	    if (err)
 	      panic ("Failed to unmarshal exception: %d", err);
 
@@ -542,7 +542,7 @@ hurd_activation_handler_activated (struct hurd_utcb *utcb)
       uintptr_t label = vg_message_word (mb->reply, 0);
       switch (label)
 	{
-	case ACTIVATION_fault:
+	case VG_ACTIVATION_fault:
 	  {
 	    vg_addr_t fault;
 	    uintptr_t ip;
@@ -550,9 +550,9 @@ hurd_activation_handler_activated (struct hurd_utcb *utcb)
 	    struct vg_activation_fault_info info;
 
 	    error_t err;
-	    err = activation_fault_send_unmarshal (mb->reply,
-						   &fault, &sp, &ip, &info,
-						   NULL);
+	    err = vg_activation_fault_send_unmarshal (mb->reply,
+						      &fault, &sp, &ip, &info,
+						      NULL);
 	    if (err)
 	      panic ("Failed to unmarshal exception: %d", err);
 
@@ -679,11 +679,11 @@ hurd_activation_handler_init_early (void)
   utcb->vg.activation_handler_ip = (uintptr_t) &hurd_activation_handler_entry;
   utcb->vg.activation_handler_end = (uintptr_t) &hurd_activation_handler_end;
 
-  struct hurd_thread_exregs_in in;
+  struct vg_thread_exregs_in in;
   memset (&in, 0, sizeof (in));
 
   struct vg_message *msg = (void *) &activation_handler_msg[0];
-  vg_thread_exregs_send_marshal (msg, HURD_EXREGS_SET_UTCB, in,
+  vg_thread_exregs_send_marshal (msg, VG_EXREGS_SET_UTCB, in,
 				 VG_ADDR_VOID, VG_ADDR_VOID,
 				 VG_PTR_TO_PAGE (utcb), VG_ADDR_VOID,
 				 __hurd_startup_data->messengers[1]);
@@ -854,12 +854,12 @@ hurd_activation_state_alloc (vg_addr_t thread, struct hurd_utcb **utcbp)
 
   *utcbp = utcb;
 
-  struct hurd_thread_exregs_in in;
-  struct hurd_thread_exregs_out out;
+  struct vg_thread_exregs_in in;
+  struct vg_thread_exregs_out out;
 
   err = vg_thread_exregs (VG_ADDR_VOID, thread,
-			  HURD_EXREGS_SET_UTCB
-			  | HURD_EXREGS_SET_EXCEPTION_MESSENGER,
+			  VG_EXREGS_SET_UTCB
+			  | VG_EXREGS_SET_EXCEPTION_MESSENGER,
 			  in, VG_ADDR_VOID, VG_ADDR_VOID,
 			  VG_PTR_TO_PAGE (utcb), utcb->exception_buffer->receiver,
 			  &out, NULL, NULL, NULL, NULL);
diff --git a/libhurd-mm/storage.c b/libhurd-mm/storage.c
index 388603d..5d37a56 100644
--- a/libhurd-mm/storage.c
+++ b/libhurd-mm/storage.c
@@ -58,7 +58,7 @@ struct storage_desc
   /* The address of the folio.  */
   vg_addr_t folio;
   /* The location of the shadow vg_cap designating this folio.  */
-  struct object *shadow;
+  struct vg_object *shadow;
 
   /* Which objects are allocated.  */
   unsigned char alloced[VG_FOLIO_OBJECTS / 8];
@@ -245,7 +245,7 @@ shadow_setup (struct vg_cap *cap, struct storage_desc *desc)
      storage descriptor, which is still unreachable from any other
      thread.  */
 
-  struct object *shadow;
+  struct vg_object *shadow;
 
   int idx = bit_alloc (desc->alloced, sizeof (desc->alloced), 0);
   if (likely (idx != -1))
@@ -531,7 +531,7 @@ storage_check_reserve (bool i_may_have_lock)
 struct storage
 storage_alloc (vg_addr_t activity,
 	       enum vg_cap_type type, enum storage_expectancy expectancy,
-	       struct object_policy policy,
+	       struct vg_object_policy policy,
 	       vg_addr_t addr)
 {
   assert (storage_init_done);
@@ -652,7 +652,7 @@ storage_alloc (vg_addr_t activity,
 	   idx, VG_ADDR_PRINTF (folio), VG_ADDR_PRINTF (addr), err);
   assert (VG_ADDR_EQ (a, addr));
 
-  struct object *shadow = desc->shadow;
+  struct vg_object *shadow = desc->shadow;
   struct vg_cap *cap = NULL;
   if (likely (!! shadow))
     {
@@ -729,7 +729,7 @@ storage_free_ (vg_addr_t object, bool unmap_now)
 
   storage->free ++;
 
-  struct object *shadow = storage->shadow;
+  struct vg_object *shadow = storage->shadow;
 
   if (storage->free == VG_FOLIO_OBJECTS
       || ((storage->free == VG_FOLIO_OBJECTS - 1)
diff --git a/libhurd-mm/storage.h b/libhurd-mm/storage.h
index e454b83..c3ea151 100644
--- a/libhurd-mm/storage.h
+++ b/libhurd-mm/storage.h
@@ -64,7 +64,7 @@ struct storage
 extern struct storage storage_alloc (vg_addr_t activity,
 				     enum vg_cap_type type,
 				     enum storage_expectancy expectancy,
-				     struct object_policy policy,
+				     struct vg_object_policy policy,
 				     vg_addr_t addr);
 #define storage_alloc(__sa_activity, __sa_type, __sa_expectancy,	\
 		      __sa_policy, __sa_addr)				\