[Xen-changelog] [xen-unstable] Move primitive-type guest-handle definitions into common xen.h header file.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1200670732 0
# Node ID 692a91e3b2626796b9e7046e0831f3d4d5b51be1
# Parent  478c798b9937a6c15905e4c194009684e7c56bf0
Move primitive-type guest-handle definitions into common xen.h header file.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 xen/include/public/arch-ia64.h    |   11 -----------
 xen/include/public/arch-powerpc.h |   10 ----------
 xen/include/public/arch-x86/xen.h |   10 ----------
 xen/include/public/xen.h          |   13 +++++++++++++
 4 files changed, 13 insertions(+), 31 deletions(-)

diff -r 478c798b9937 -r 692a91e3b262 xen/include/public/arch-ia64.h
--- a/xen/include/public/arch-ia64.h    Fri Jan 18 15:28:59 2008 +0000
+++ b/xen/include/public/arch-ia64.h    Fri Jan 18 15:38:52 2008 +0000
@@ -47,18 +47,7 @@
 #endif
 
 #ifndef __ASSEMBLY__
-/* Guest handles for primitive C types. */
-__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(u64,   unsigned long);
-DEFINE_XEN_GUEST_HANDLE(char);
-DEFINE_XEN_GUEST_HANDLE(int);
-DEFINE_XEN_GUEST_HANDLE(long);
-DEFINE_XEN_GUEST_HANDLE(void);
-
 typedef unsigned long xen_pfn_t;
-DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
 #define PRI_xen_pfn "lx"
 #endif
 
diff -r 478c798b9937 -r 692a91e3b262 xen/include/public/arch-powerpc.h
--- a/xen/include/public/arch-powerpc.h Fri Jan 18 15:28:59 2008 +0000
+++ b/xen/include/public/arch-powerpc.h Fri Jan 18 15:38:52 2008 +0000
@@ -47,17 +47,7 @@
 #endif
 
 #ifndef __ASSEMBLY__
-/* Guest handles for primitive C types. */
-__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);
-
 typedef unsigned long long xen_pfn_t;
-DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
 #define PRI_xen_pfn "llx"
 #endif
 
diff -r 478c798b9937 -r 692a91e3b262 xen/include/public/arch-x86/xen.h
--- a/xen/include/public/arch-x86/xen.h Fri Jan 18 15:28:59 2008 +0000
+++ b/xen/include/public/arch-x86/xen.h Fri Jan 18 15:38:52 2008 +0000
@@ -53,17 +53,7 @@
 #endif
 
 #ifndef __ASSEMBLY__
-/* Guest handles for primitive C types. */
-__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);
-
 typedef unsigned long xen_pfn_t;
-DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
 #define PRI_xen_pfn "lx"
 #endif
 
diff -r 478c798b9937 -r 692a91e3b262 xen/include/public/xen.h
--- a/xen/include/public/xen.h  Fri Jan 18 15:28:59 2008 +0000
+++ b/xen/include/public/xen.h  Fri Jan 18 15:38:52 2008 +0000
@@ -37,6 +37,19 @@
 #include "arch-powerpc.h"
 #else
 #error "Unsupported architecture"
+#endif
+
+#ifndef __ASSEMBLY__
+/* Guest handles for primitive C types. */
+DEFINE_XEN_GUEST_HANDLE(char);
+__DEFINE_XEN_GUEST_HANDLE(uchar, unsigned char);
+DEFINE_XEN_GUEST_HANDLE(int);
+__DEFINE_XEN_GUEST_HANDLE(uint,  unsigned int);
+DEFINE_XEN_GUEST_HANDLE(long);
+__DEFINE_XEN_GUEST_HANDLE(ulong, unsigned long);
+DEFINE_XEN_GUEST_HANDLE(void);
+
+DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
 #endif
 
 /*

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