diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-09-02 13:29:45 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-09-02 13:29:45 +0100 |
| commit | 9e24317d4e64d924d733b35f8dc8738fdc2241d3 (patch) | |
| tree | 583ea30898ade3a97e60dabe4bc190f9dd180068 /xen/include/public/xen.h | |
| parent | 09cae24637fb571d6216a7bd45e486a6c3d4d8e3 (diff) | |
| download | xen-9e24317d4e64d924d733b35f8dc8738fdc2241d3.tar.gz xen-9e24317d4e64d924d733b35f8dc8738fdc2241d3.tar.bz2 xen-9e24317d4e64d924d733b35f8dc8738fdc2241d3.zip | |
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@citrix.com>
Diffstat (limited to 'xen/include/public/xen.h')
| -rw-r--r-- | xen/include/public/xen.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h index bd80f0e766..6c783412cf 100644 --- a/xen/include/public/xen.h +++ b/xen/include/public/xen.h @@ -688,6 +688,9 @@ __DEFINE_XEN_GUEST_HANDLE(uint64, uint64_t); #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,13 +698,15 @@ __DEFINE_XEN_GUEST_HANDLE(uint64, uint64_t); #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__ */ /* |