ia64/xen-unstable
changeset 16674:ad0f20f5590a
Rename uintN_t guest handles to uintN, to avoid nameclash with uintN_t
macros during the handle definitions.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
macros during the handle definitions.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
| author | Keir Fraser <keir.fraser@citrix.com> |
|---|---|
| date | Fri Dec 28 15:44:51 2007 +0000 (2007-12-28) |
| parents | 62c38443e9f7 |
| children | 688e9186eed4 |
| files | xen/arch/x86/platform_hypercall.c xen/include/asm-powerpc/domain.h xen/include/asm-x86/domain.h xen/include/public/arch-ia64.h xen/include/public/arch-powerpc.h xen/include/public/arch-x86/xen-x86_32.h xen/include/public/arch-x86/xen.h xen/include/public/domctl.h xen/include/public/physdev.h xen/include/public/platform.h xen/include/public/sysctl.h xen/include/public/xen.h |
line diff
1.1 --- a/xen/arch/x86/platform_hypercall.c Fri Dec 28 15:27:53 2007 +0000 1.2 +++ b/xen/arch/x86/platform_hypercall.c Fri Dec 28 15:44:51 2007 +0000 1.3 @@ -298,8 +298,8 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe 1.4 struct vcpu *v; 1.5 struct xenctl_cpumap ctlmap; 1.6 cpumask_t cpumap; 1.7 - XEN_GUEST_HANDLE(uint8_t) cpumap_bitmap; 1.8 - XEN_GUEST_HANDLE(uint64_t) idletimes; 1.9 + XEN_GUEST_HANDLE(uint8) cpumap_bitmap; 1.10 + XEN_GUEST_HANDLE(uint64) idletimes; 1.11 1.12 ret = -ENOSYS; 1.13 if ( cpufreq_controller != FREQCTL_dom0_kernel )
2.1 --- a/xen/include/asm-powerpc/domain.h Fri Dec 28 15:27:53 2007 +0000 2.2 +++ b/xen/include/asm-powerpc/domain.h Fri Dec 28 15:44:51 2007 +0000 2.3 @@ -53,9 +53,6 @@ struct arch_domain { 2.4 uint foreign_mfn_count; 2.5 uint *foreign_mfns; 2.6 2.7 - /* I/O-port access bitmap mask. */ 2.8 - u8 *iobmp_mask; /* Address of IO bitmap mask, or NULL. */ 2.9 - 2.10 u32 *p2m; /* Array of 32-bit MFNs supports 44 bits of physical memory. */ 2.11 ulong p2m_entries; 2.12 2.13 @@ -105,11 +102,6 @@ struct arch_vcpu { 2.14 /* Segment Lookaside Buffer */ 2.15 struct slb_entry slb_entries[NUM_SLB_ENTRIES]; 2.16 2.17 - /* I/O-port access bitmap. */ 2.18 - XEN_GUEST_HANDLE(uint8_t) iobmp; /* Guest kernel virtual address of the bitmap. */ 2.19 - int iobmp_limit; /* Number of ports represented in the bitmap. */ 2.20 - int iopl; /* Current IOPL for this VCPU. */ 2.21 - 2.22 u32 dec; 2.23 struct cpu_vcpu cpu; /* CPU-specific bits */ 2.24 struct xencomm *xencomm;
3.1 --- a/xen/include/asm-x86/domain.h Fri Dec 28 15:27:53 2007 +0000 3.2 +++ b/xen/include/asm-x86/domain.h Fri Dec 28 15:44:51 2007 +0000 3.3 @@ -293,7 +293,7 @@ struct arch_vcpu 3.4 struct trap_bounce trap_bounce; 3.5 3.6 /* I/O-port access bitmap. */ 3.7 - XEN_GUEST_HANDLE(uint8_t) iobmp; /* Guest kernel vaddr of the bitmap. */ 3.8 + XEN_GUEST_HANDLE(uint8) iobmp; /* Guest kernel vaddr of the bitmap. */ 3.9 int iobmp_limit; /* Number of ports represented in the bitmap. */ 3.10 int iopl; /* Current IOPL for this VCPU. */ 3.11
4.1 --- a/xen/include/public/arch-ia64.h Fri Dec 28 15:27:53 2007 +0000 4.2 +++ b/xen/include/public/arch-ia64.h Fri Dec 28 15:44:51 2007 +0000 4.3 @@ -28,13 +28,15 @@ 4.4 4.5 /* Structural guest handles introduced in 0x00030201. */ 4.6 #if __XEN_INTERFACE_VERSION__ >= 0x00030201 4.7 -#define __DEFINE_XEN_GUEST_HANDLE(name, type) \ 4.8 +#define ___DEFINE_XEN_GUEST_HANDLE(name, type) \ 4.9 typedef struct { type *p; } __guest_handle_ ## name 4.10 #else 4.11 -#define __DEFINE_XEN_GUEST_HANDLE(name, type) \ 4.12 +#define ___DEFINE_XEN_GUEST_HANDLE(name, type) \ 4.13 typedef type * __guest_handle_ ## name 4.14 #endif 4.15 4.16 +#define __DEFINE_XEN_GUEST_HANDLE(name, type) \ 4.17 + ___DEFINE_XEN_GUEST_HANDLE(name, type) 4.18 #define DEFINE_XEN_GUEST_HANDLE(name) __DEFINE_XEN_GUEST_HANDLE(name, name) 4.19 #define XEN_GUEST_HANDLE(name) __guest_handle_ ## name 4.20 #define XEN_GUEST_HANDLE_64(name) XEN_GUEST_HANDLE(name)
5.1 --- a/xen/include/public/arch-powerpc.h Fri Dec 28 15:27:53 2007 +0000 5.2 +++ b/xen/include/public/arch-powerpc.h Fri Dec 28 15:44:51 2007 +0000 5.3 @@ -25,12 +25,14 @@ 5.4 #ifndef __XEN_PUBLIC_ARCH_PPC_64_H__ 5.5 #define __XEN_PUBLIC_ARCH_PPC_64_H__ 5.6 5.7 -#define __DEFINE_XEN_GUEST_HANDLE(name, type) \ 5.8 +#define ___DEFINE_XEN_GUEST_HANDLE(name, type) \ 5.9 typedef struct { \ 5.10 int __pad[(sizeof (long long) - sizeof (void *)) / sizeof (int)]; \ 5.11 type *p; \ 5.12 } __attribute__((__aligned__(8))) __guest_handle_ ## name 5.13 5.14 +#define __DEFINE_XEN_GUEST_HANDLE(name, type) \ 5.15 + ___DEFINE_XEN_GUEST_HANDLE(name, type) 5.16 #define DEFINE_XEN_GUEST_HANDLE(name) __DEFINE_XEN_GUEST_HANDLE(name, name) 5.17 #define XEN_GUEST_HANDLE(name) __guest_handle_ ## name 5.18 #define set_xen_guest_handle(hnd, val) \
6.1 --- a/xen/include/public/arch-x86/xen-x86_32.h Fri Dec 28 15:27:53 2007 +0000 6.2 +++ b/xen/include/public/arch-x86/xen-x86_32.h Fri Dec 28 15:44:51 2007 +0000 6.3 @@ -107,8 +107,8 @@ 6.4 6.5 /* 32-/64-bit invariability for control interfaces (domctl/sysctl). */ 6.6 #if defined(__XEN__) || defined(__XEN_TOOLS__) 6.7 -#undef __DEFINE_XEN_GUEST_HANDLE 6.8 -#define __DEFINE_XEN_GUEST_HANDLE(name, type) \ 6.9 +#undef ___DEFINE_XEN_GUEST_HANDLE 6.10 +#define ___DEFINE_XEN_GUEST_HANDLE(name, type) \ 6.11 typedef struct { type *p; } \ 6.12 __guest_handle_ ## name; \ 6.13 typedef struct { union { type *p; uint64_aligned_t q; }; } \
7.1 --- a/xen/include/public/arch-x86/xen.h Fri Dec 28 15:27:53 2007 +0000 7.2 +++ b/xen/include/public/arch-x86/xen.h Fri Dec 28 15:44:51 2007 +0000 7.3 @@ -29,13 +29,15 @@ 7.4 7.5 /* Structural guest handles introduced in 0x00030201. */ 7.6 #if __XEN_INTERFACE_VERSION__ >= 0x00030201 7.7 -#define __DEFINE_XEN_GUEST_HANDLE(name, type) \ 7.8 +#define ___DEFINE_XEN_GUEST_HANDLE(name, type) \ 7.9 typedef struct { type *p; } __guest_handle_ ## name 7.10 #else 7.11 -#define __DEFINE_XEN_GUEST_HANDLE(name, type) \ 7.12 +#define ___DEFINE_XEN_GUEST_HANDLE(name, type) \ 7.13 typedef type * __guest_handle_ ## name 7.14 #endif 7.15 7.16 +#define __DEFINE_XEN_GUEST_HANDLE(name, type) \ 7.17 + ___DEFINE_XEN_GUEST_HANDLE(name, type) 7.18 #define DEFINE_XEN_GUEST_HANDLE(name) __DEFINE_XEN_GUEST_HANDLE(name, name) 7.19 #define __XEN_GUEST_HANDLE(name) __guest_handle_ ## name 7.20 #define XEN_GUEST_HANDLE(name) __XEN_GUEST_HANDLE(name)
8.1 --- a/xen/include/public/domctl.h Fri Dec 28 15:27:53 2007 +0000 8.2 +++ b/xen/include/public/domctl.h Fri Dec 28 15:44:51 2007 +0000 8.3 @@ -37,7 +37,7 @@ 8.4 #define XEN_DOMCTL_INTERFACE_VERSION 0x00000005 8.5 8.6 struct xenctl_cpumap { 8.7 - XEN_GUEST_HANDLE_64(uint8_t) bitmap; 8.8 + XEN_GUEST_HANDLE_64(uint8) bitmap; 8.9 uint32_t nr_cpus; 8.10 }; 8.11 8.12 @@ -115,7 +115,7 @@ struct xen_domctl_getmemlist { 8.13 uint64_aligned_t max_pfns; 8.14 /* Start index in guest's page list. */ 8.15 uint64_aligned_t start_pfn; 8.16 - XEN_GUEST_HANDLE_64(uint64_t) buffer; 8.17 + XEN_GUEST_HANDLE_64(uint64) buffer; 8.18 /* OUT variables. */ 8.19 uint64_aligned_t num_pfns; 8.20 }; 8.21 @@ -152,7 +152,7 @@ struct xen_domctl_getpageframeinfo2 { 8.22 /* IN variables. */ 8.23 uint64_aligned_t num; 8.24 /* IN/OUT variables. */ 8.25 - XEN_GUEST_HANDLE_64(uint32_t) array; 8.26 + XEN_GUEST_HANDLE_64(uint32) array; 8.27 }; 8.28 typedef struct xen_domctl_getpageframeinfo2 xen_domctl_getpageframeinfo2_t; 8.29 DEFINE_XEN_GUEST_HANDLE(xen_domctl_getpageframeinfo2_t); 8.30 @@ -226,7 +226,7 @@ struct xen_domctl_shadow_op { 8.31 uint32_t mb; /* Shadow memory allocation in MB */ 8.32 8.33 /* OP_PEEK / OP_CLEAN */ 8.34 - XEN_GUEST_HANDLE_64(uint8_t) dirty_bitmap; 8.35 + XEN_GUEST_HANDLE_64(uint8) dirty_bitmap; 8.36 uint64_aligned_t pages; /* Size of buffer. Updated with actual size. */ 8.37 struct xen_domctl_shadow_op_stats stats; 8.38 }; 8.39 @@ -398,10 +398,9 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_setti 8.40 #define XEN_DOMCTL_sethvmcontext 34 8.41 typedef struct xen_domctl_hvmcontext { 8.42 uint32_t size; /* IN/OUT: size of buffer / bytes filled */ 8.43 - XEN_GUEST_HANDLE_64(uint8_t) buffer; /* IN/OUT: data, or call 8.44 - * gethvmcontext with NULL 8.45 - * buffer to get size 8.46 - * req'd */ 8.47 + XEN_GUEST_HANDLE_64(uint8) buffer; /* IN/OUT: data, or call 8.48 + * gethvmcontext with NULL 8.49 + * buffer to get size req'd */ 8.50 } xen_domctl_hvmcontext_t; 8.51 DEFINE_XEN_GUEST_HANDLE(xen_domctl_hvmcontext_t); 8.52
9.1 --- a/xen/include/public/physdev.h Fri Dec 28 15:27:53 2007 +0000 9.2 +++ b/xen/include/public/physdev.h Fri Dec 28 15:44:51 2007 +0000 9.3 @@ -81,7 +81,7 @@ DEFINE_XEN_GUEST_HANDLE(physdev_set_iopl 9.4 #define PHYSDEVOP_set_iobitmap 7 9.5 struct physdev_set_iobitmap { 9.6 /* IN */ 9.7 - XEN_GUEST_HANDLE_00030205(uint8_t) bitmap; 9.8 + XEN_GUEST_HANDLE_00030205(uint8) bitmap; 9.9 uint32_t nr_ports; 9.10 }; 9.11 typedef struct physdev_set_iobitmap physdev_set_iobitmap_t;
10.1 --- a/xen/include/public/platform.h Fri Dec 28 15:27:53 2007 +0000 10.2 +++ b/xen/include/public/platform.h Fri Dec 28 15:44:51 2007 +0000 10.3 @@ -146,7 +146,7 @@ struct xenpf_firmware_info { 10.4 uint8_t capabilities; 10.5 uint8_t edid_transfer_time; 10.6 /* must refer to 128-byte buffer */ 10.7 - XEN_GUEST_HANDLE(uint8_t) edid; 10.8 + XEN_GUEST_HANDLE(uint8) edid; 10.9 } vbeddc_info; /* XEN_FW_VBEDDC_INFO */ 10.10 } u; 10.11 }; 10.12 @@ -186,12 +186,12 @@ DEFINE_XEN_GUEST_HANDLE(xenpf_change_fre 10.13 struct xenpf_getidletime { 10.14 /* IN/OUT variables */ 10.15 /* IN: CPUs to interrogate; OUT: subset of IN which are present */ 10.16 - XEN_GUEST_HANDLE(uint8_t) cpumap_bitmap; 10.17 + XEN_GUEST_HANDLE(uint8) cpumap_bitmap; 10.18 /* IN variables */ 10.19 /* Size of cpumap bitmap. */ 10.20 uint32_t cpumap_nr_cpus; 10.21 /* Must be indexable for every cpu in cpumap_bitmap. */ 10.22 - XEN_GUEST_HANDLE(uint64_t) idletime; 10.23 + XEN_GUEST_HANDLE(uint64) idletime; 10.24 /* OUT variables */ 10.25 /* System time when the idletime snapshots were taken. */ 10.26 uint64_t now;
11.1 --- a/xen/include/public/sysctl.h Fri Dec 28 15:27:53 2007 +0000 11.2 +++ b/xen/include/public/sysctl.h Fri Dec 28 15:44:51 2007 +0000 11.3 @@ -111,7 +111,7 @@ struct xen_sysctl_physinfo { 11.4 * If the actual @max_cpu_id is smaller than the array then the trailing 11.5 * elements of the array will not be written by the sysctl. 11.6 */ 11.7 - XEN_GUEST_HANDLE_64(uint32_t) cpu_to_node; 11.8 + XEN_GUEST_HANDLE_64(uint32) cpu_to_node; 11.9 }; 11.10 typedef struct xen_sysctl_physinfo xen_sysctl_physinfo_t; 11.11 DEFINE_XEN_GUEST_HANDLE(xen_sysctl_physinfo_t);
12.1 --- a/xen/include/public/xen.h Fri Dec 28 15:27:53 2007 +0000 12.2 +++ b/xen/include/public/xen.h Fri Dec 28 15:44:51 2007 +0000 12.3 @@ -583,10 +583,10 @@ typedef uint8_t xen_domain_handle_t[16]; 12.4 #define __mk_unsigned_long(x) x ## UL 12.5 #define mk_unsigned_long(x) __mk_unsigned_long(x) 12.6 12.7 -DEFINE_XEN_GUEST_HANDLE(uint8_t); 12.8 -DEFINE_XEN_GUEST_HANDLE(uint16_t); 12.9 -DEFINE_XEN_GUEST_HANDLE(uint32_t); 12.10 -DEFINE_XEN_GUEST_HANDLE(uint64_t); 12.11 +__DEFINE_XEN_GUEST_HANDLE(uint8, uint8_t); 12.12 +__DEFINE_XEN_GUEST_HANDLE(uint16, uint16_t); 12.13 +__DEFINE_XEN_GUEST_HANDLE(uint32, uint32_t); 12.14 +__DEFINE_XEN_GUEST_HANDLE(uint64, uint64_t); 12.15 12.16 #else /* __ASSEMBLY__ */ 12.17