[Xen-changelog] [xen-unstable] Revert 5b03813d8d6e "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 1283430585 -3600
# Node ID b5deda1c6bc4b08c156324a5f1e14b3bca993e65
# Parent  eff592364826a7361b6d72adca596c5ee2331840
Revert 5b03813d8d6e "Make uint64_aligned_t and GUEST_HANDLE_64 visible to 
guests."

This introduced non-ANSI gcc-isms into the guest-visible sections of
public headers. Not allowed after all.

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, 9 insertions(+), 2 deletions(-)

diff -r eff592364826 -r b5deda1c6bc4 xen/include/public/arch-x86/xen-x86_32.h
--- a/xen/include/public/arch-x86/xen-x86_32.h  Wed Sep 01 11:23:49 2010 +0100
+++ b/xen/include/public/arch-x86/xen-x86_32.h  Thu Sep 02 13:29:45 2010 +0100
@@ -100,7 +100,8 @@
 #define machine_to_phys_mapping ((unsigned long *)MACH2PHYS_VIRT_START)
 #endif
 
-/* 32-/64-bit invariability. */
+/* 32-/64-bit invariability for control interfaces (domctl/sysctl). */
+#if defined(__XEN__) || defined(__XEN_TOOLS__)
 #undef ___DEFINE_XEN_GUEST_HANDLE
 #define ___DEFINE_XEN_GUEST_HANDLE(name, type)                  \
     typedef struct { type *p; }                                 \
@@ -115,6 +116,7 @@
 #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 eff592364826 -r b5deda1c6bc4 xen/include/public/xen.h
--- a/xen/include/public/xen.h  Wed Sep 01 11:23:49 2010 +0100
+++ b/xen/include/public/xen.h  Thu Sep 02 13:29:45 2010 +0100
@@ -688,6 +688,9 @@ __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
@@ -695,12 +698,14 @@ __DEFINE_XEN_GUEST_HANDLE(uint64, uint64
 #define XEN_GUEST_HANDLE_64(name) XEN_GUEST_HANDLE(name)
 #endif
 
-#if (defined(__XEN__) || defined(__XEN_TOOLS__)) && !defined(__ASSEMBLY__)
+#ifndef __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