[Xen-changelog] [xen-unstable] Make uint64_aligned_t and GUEST_HANDLE_64 visible to guests.

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1283332636 -3600
# Node ID 5b03813d8d6ea36e07dbde2b50887341476336ed
# Parent  2c2b177f8b711092572f70c90ff067745074099a
Make uint64_aligned_t and GUEST_HANDLE_64 visible to guests.

No reason to hide them and they're useful for building 32/64-bit
invariant hypercall structures.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/include/public/arch-x86/xen-x86_32.h |    4 +---
 xen/include/public/xen.h                 |    7 +------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff -r 2c2b177f8b71 -r 5b03813d8d6e xen/include/public/arch-x86/xen-x86_32.h
--- a/xen/include/public/arch-x86/xen-x86_32.h  Wed Sep 01 10:16:39 2010 +0100
+++ b/xen/include/public/arch-x86/xen-x86_32.h  Wed Sep 01 10:17:16 2010 +0100
@@ -100,8 +100,7 @@
 #define machine_to_phys_mapping ((unsigned long *)MACH2PHYS_VIRT_START)
 #endif
 
-/* 32-/64-bit invariability for control interfaces (domctl/sysctl). */
-#if defined(__XEN__) || defined(__XEN_TOOLS__)
+/* 32-/64-bit invariability. */
 #undef ___DEFINE_XEN_GUEST_HANDLE
 #define ___DEFINE_XEN_GUEST_HANDLE(name, type)                  \
     typedef struct { type *p; }                                 \
@@ -116,7 +115,6 @@
 #define uint64_aligned_t uint64_t __attribute__((aligned(8)))
 #define __XEN_GUEST_HANDLE_64(name) __guest_handle_64_ ## name
 #define XEN_GUEST_HANDLE_64(name) __XEN_GUEST_HANDLE_64(name)
-#endif
 
 #ifndef __ASSEMBLY__
 
diff -r 2c2b177f8b71 -r 5b03813d8d6e xen/include/public/xen.h
--- a/xen/include/public/xen.h  Wed Sep 01 10:16:39 2010 +0100
+++ b/xen/include/public/xen.h  Wed Sep 01 10:17:16 2010 +0100
@@ -688,9 +688,6 @@ __DEFINE_XEN_GUEST_HANDLE(uint64, uint64
 
 #endif /* !__ASSEMBLY__ */
 
-/* Default definitions for macros used by domctl/sysctl. */
-#if defined(__XEN__) || defined(__XEN_TOOLS__)
-
 #ifndef uint64_aligned_t
 #define uint64_aligned_t uint64_t
 #endif
@@ -698,14 +695,12 @@ __DEFINE_XEN_GUEST_HANDLE(uint64, uint64
 #define XEN_GUEST_HANDLE_64(name) XEN_GUEST_HANDLE(name)
 #endif
 
-#ifndef __ASSEMBLY__
+#if (defined(__XEN__) || defined(__XEN_TOOLS__)) && !defined(__ASSEMBLY__)
 struct xenctl_cpumap {
     XEN_GUEST_HANDLE_64(uint8) bitmap;
     uint32_t nr_cpus;
 };
 #endif
-
-#endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */
 
 #endif /* __XEN_PUBLIC_XEN_H__ */
 

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