[XenPPC] [pushed] [ppc] s/GUEST_HANDLE/XEN_GUEST_HANDLE/g

[jimix@xxxxxxxxxxxxxx]

changeset:   10254:a6340a209f101b48e5877db9c5c18887927365e8
user:        jimix@xxxxxxxxxxxxxxxxxxxxx
date:        Tue May  9 16:06:05 2006 -0400
files:       xen/arch/ppc/dom0_ops.c xen/arch/ppc/mm.c 
xen/include/asm-ppc/guest_access.h xen/include/asm-ppc/mm.h 
xen/include/public/arch-ppc64.h
description:
[ppc] s/GUEST_HANDLE/XEN_GUEST_HANDLE/g


diff -r 399b57375e1040ac3dcb9d00fa3aec1ca52e0d3e -r 
a6340a209f101b48e5877db9c5c18887927365e8 xen/arch/ppc/dom0_ops.c
--- a/xen/arch/ppc/dom0_ops.c   Tue May  9 15:53:29 2006 -0400
+++ b/xen/arch/ppc/dom0_ops.c   Tue May  9 16:06:05 2006 -0400
@@ -31,7 +31,7 @@ void arch_getdomaininfo_ctxt(struct vcpu
     /* XXX fill in rest of vcpu_guest_context_t */
 }
 
-long arch_do_dom0_op(struct dom0_op *op, GUEST_HANDLE(dom0_op_t) u_dom0_op)
+long arch_do_dom0_op(struct dom0_op *op, XEN_GUEST_HANDLE(dom0_op_t) u_dom0_op)
 {
     long ret = 0;
 
diff -r 399b57375e1040ac3dcb9d00fa3aec1ca52e0d3e -r 
a6340a209f101b48e5877db9c5c18887927365e8 xen/arch/ppc/mm.c
--- a/xen/arch/ppc/mm.c Tue May  9 15:53:29 2006 -0400
+++ b/xen/arch/ppc/mm.c Tue May  9 16:06:05 2006 -0400
@@ -72,7 +72,7 @@ void __init init_frametable(void)
     memset(frame_table, 0, frame_table_size);
 }
 
-long arch_memory_op(int op, GUEST_HANDLE(void) arg)
+long arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg)
 {
     printk("%s: no PPC specific memory ops\n", __func__);
     return -ENOSYS;
diff -r 399b57375e1040ac3dcb9d00fa3aec1ca52e0d3e -r 
a6340a209f101b48e5877db9c5c18887927365e8 xen/include/asm-ppc/guest_access.h
--- a/xen/include/asm-ppc/guest_access.h        Tue May  9 15:53:29 2006 -0400
+++ b/xen/include/asm-ppc/guest_access.h        Tue May  9 16:06:05 2006 -0400
@@ -38,7 +38,7 @@ extern void xencomm_add_offset(void *han
 /* Cast a guest handle to the specified type of handle. */
 #define guest_handle_cast(hnd, type) ({         \
     type *_x = (hnd).p;                         \
-    (GUEST_HANDLE(type)) { _x };                \
+    (XEN_GUEST_HANDLE(type)) { _x };                \
 })
 
 /* Since we run in real mode, we can safely access all addresses. That also
diff -r 399b57375e1040ac3dcb9d00fa3aec1ca52e0d3e -r 
a6340a209f101b48e5877db9c5c18887927365e8 xen/include/asm-ppc/mm.h
--- a/xen/include/asm-ppc/mm.h  Tue May  9 15:53:29 2006 -0400
+++ b/xen/include/asm-ppc/mm.h  Tue May  9 16:06:05 2006 -0400
@@ -201,7 +201,7 @@ extern ulong pfn2mfn(struct domain *d, l
 extern ulong pfn2mfn(struct domain *d, long mfn, int *type);
 
 /* Arch-specific portion of memory_op hypercall. */
-long arch_memory_op(int op, GUEST_HANDLE(void) arg);
+long arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg);
 
 /* XXX implement me? */
 #define set_gpfn_from_mfn(mfn, pfn) do { } while (0)
diff -r 399b57375e1040ac3dcb9d00fa3aec1ca52e0d3e -r 
a6340a209f101b48e5877db9c5c18887927365e8 xen/include/public/arch-ppc64.h
--- a/xen/include/public/arch-ppc64.h   Tue May  9 15:53:29 2006 -0400
+++ b/xen/include/public/arch-ppc64.h   Tue May  9 16:06:05 2006 -0400
@@ -21,25 +21,25 @@
 #define __XEN_PUBLIC_ARCH_PPC_64_H__
 
 #ifdef __XEN__
-#define __DEFINE_GUEST_HANDLE(name, type) \
+#define __DEFINE_XEN_GUEST_HANDLE(name, type) \
     typedef struct { type *p; } __guest_handle_ ## name
 #else
-#define __DEFINE_GUEST_HANDLE(name, type) \
+#define __DEFINE_XEN_GUEST_HANDLE(name, type) \
     typedef type * __guest_handle_ ## name
 #endif
 
-#define DEFINE_GUEST_HANDLE(name) __DEFINE_GUEST_HANDLE(name, name)
-#define GUEST_HANDLE(name)        __guest_handle_ ## name
+#define DEFINE_XEN_GUEST_HANDLE(name) __DEFINE_XEN_GUEST_HANDLE(name, name)
+#define XEN_GUEST_HANDLE(name)        __guest_handle_ ## name
 
 #ifndef __ASSEMBLY__
 /* Guest handles for primitive C types. */
-__DEFINE_GUEST_HANDLE(uchar, unsigned char);
-__DEFINE_GUEST_HANDLE(uint,  unsigned int);
-__DEFINE_GUEST_HANDLE(ulong, unsigned long);
-DEFINE_GUEST_HANDLE(char);
-DEFINE_GUEST_HANDLE(int);
-DEFINE_GUEST_HANDLE(long);
-DEFINE_GUEST_HANDLE(void);
+__DEFINE_XEN_GUEST_HANDLE(uchar, unsigned char);
+__DEFINE_XEN_GUEST_HANDLE(uint,  unsigned int);
+__DEFINE_XEN_GUEST_HANDLE(ulong, unsigned long);
+DEFINE_XEN_GUEST_HANDLE(char);
+DEFINE_XEN_GUEST_HANDLE(int);
+DEFINE_XEN_GUEST_HANDLE(long);
+DEFINE_XEN_GUEST_HANDLE(void);
 #endif
 
 /*
@@ -85,7 +85,7 @@ typedef struct vcpu_guest_context {
     uint64_t sdr1;                     /* Pagetable base               */
     /* XXX etc */
 } vcpu_guest_context_t;
-DEFINE_GUEST_HANDLE(vcpu_guest_context_t);
+DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t);
 
 typedef struct {
 } arch_shared_info_t;



_______________________________________________
Xen-ppc-devel mailing list
Xen-ppc-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ppc-devel