WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 		  
Home Products Support Community News
 
   
 

xen-changelog

[Top] [All Lists]
<prev [Date] next>
[Advanced]
 <prev [Thread] next>

[Xen-changelog] [xen-3.1-testing] Rename uintN_t guest handles to uintN,

from [Xen patchbot-3.1-testing] [Permanent Link][Original]
To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-3.1-testing] Rename uintN_t guest handles to uintN, to avoid nameclash with uintN_t
From: "Xen patchbot-3.1-testing" <patchbot-3.1-testing@xxxxxxxxxxxxxxxxxxx>
Date: Thu, 10 Jan 2008 06:30:26 -0800
Delivery-date: Thu, 10 Jan 2008 06:31:46 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx 
# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1198857170 0
# Node ID af903633d986d0aaf7f5ce04c456e0ab002a9560
# Parent  51cbb2440b565475e6e8b0c2a004022b350b566d
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@xxxxxxxxxx>
xen-unstable changeset:   16674:ad0f20f5590a
xen-unstable date:        Fri Dec 28 15:44:51 2007 +0000
---
 xen/include/asm-powerpc/domain.h         |    8 --------
 xen/include/asm-x86/domain.h             |    2 +-
 xen/include/public/arch-ia64.h           |    6 ++++--
 xen/include/public/arch-powerpc.h        |    4 +++-
 xen/include/public/arch-x86/xen-x86_32.h |    4 ++--
 xen/include/public/arch-x86/xen.h        |   14 ++++++++------
 xen/include/public/domctl.h              |   15 +++++++--------
 xen/include/public/physdev.h             |    2 +-
 xen/include/public/platform.h            |    2 +-
 xen/include/public/xen.h                 |    8 ++++----
 10 files changed, 31 insertions(+), 34 deletions(-)

diff -r 51cbb2440b56 -r af903633d986 xen/include/asm-powerpc/domain.h
--- a/xen/include/asm-powerpc/domain.h  Fri Dec 28 15:47:10 2007 +0000
+++ b/xen/include/asm-powerpc/domain.h  Fri Dec 28 15:52:50 2007 +0000
@@ -40,9 +40,6 @@ struct arch_domain {
 
     uint foreign_mfn_count;
     uint *foreign_mfns;
-
-    /* I/O-port access bitmap mask. */
-    u8 *iobmp_mask;       /* Address of IO bitmap mask, or NULL.      */
 
     u32 *p2m; /* Array of 32-bit MFNs supports 44 bits of physical memory. */
     ulong p2m_entries;
@@ -88,11 +85,6 @@ struct arch_vcpu {
     /* Segment Lookaside Buffer */
     struct slb_entry slb_entries[NUM_SLB_ENTRIES];
 
-    /* I/O-port access bitmap. */
-    XEN_GUEST_HANDLE(uint8_t) iobmp; /* Guest kernel virtual address of the 
bitmap. */
-    int iobmp_limit;  /* Number of ports represented in the bitmap.  */
-    int iopl;         /* Current IOPL for this VCPU. */
-
     u32 dec;
     struct cpu_vcpu cpu; /* CPU-specific bits */
     struct xencomm *xencomm;
diff -r 51cbb2440b56 -r af903633d986 xen/include/asm-x86/domain.h
--- a/xen/include/asm-x86/domain.h      Fri Dec 28 15:47:10 2007 +0000
+++ b/xen/include/asm-x86/domain.h      Fri Dec 28 15:52:50 2007 +0000
@@ -272,7 +272,7 @@ struct arch_vcpu
     struct trap_bounce trap_bounce;
 
     /* I/O-port access bitmap. */
-    XEN_GUEST_HANDLE(uint8_t) iobmp; /* Guest kernel virtual address of the 
bitmap. */
+    XEN_GUEST_HANDLE(uint8) iobmp; /* Guest kernel virtual address of the 
bitmap. */
     int iobmp_limit;  /* Number of ports represented in the bitmap.  */
     int iopl;         /* Current IOPL for this VCPU. */
 
diff -r 51cbb2440b56 -r af903633d986 xen/include/public/arch-ia64.h
--- a/xen/include/public/arch-ia64.h    Fri Dec 28 15:47:10 2007 +0000
+++ b/xen/include/public/arch-ia64.h    Fri Dec 28 15:52:50 2007 +0000
@@ -28,13 +28,15 @@
 
 /* Structural guest handles introduced in 0x00030201. */
 #if __XEN_INTERFACE_VERSION__ >= 0x00030201
-#define __DEFINE_XEN_GUEST_HANDLE(name, type) \
+#define ___DEFINE_XEN_GUEST_HANDLE(name, type) \
     typedef struct { type *p; } __guest_handle_ ## name
 #else
-#define __DEFINE_XEN_GUEST_HANDLE(name, type) \
+#define ___DEFINE_XEN_GUEST_HANDLE(name, type) \
     typedef type * __guest_handle_ ## name
 #endif
 
+#define __DEFINE_XEN_GUEST_HANDLE(name, type) \
+    ___DEFINE_XEN_GUEST_HANDLE(name, type)
 #define DEFINE_XEN_GUEST_HANDLE(name)   __DEFINE_XEN_GUEST_HANDLE(name, name)
 #define XEN_GUEST_HANDLE(name)          __guest_handle_ ## name
 #define XEN_GUEST_HANDLE_64(name)       XEN_GUEST_HANDLE(name)
diff -r 51cbb2440b56 -r af903633d986 xen/include/public/arch-powerpc.h
--- a/xen/include/public/arch-powerpc.h Fri Dec 28 15:47:10 2007 +0000
+++ b/xen/include/public/arch-powerpc.h Fri Dec 28 15:52:50 2007 +0000
@@ -25,12 +25,14 @@
 #ifndef __XEN_PUBLIC_ARCH_PPC_64_H__
 #define __XEN_PUBLIC_ARCH_PPC_64_H__
 
-#define __DEFINE_XEN_GUEST_HANDLE(name, type) \
+#define ___DEFINE_XEN_GUEST_HANDLE(name, type) \
     typedef struct { \
         int __pad[(sizeof (long long) - sizeof (void *)) / sizeof (int)]; \
         type *p; \
     } __attribute__((__aligned__(8))) __guest_handle_ ## name
 
+#define __DEFINE_XEN_GUEST_HANDLE(name, type) \
+    ___DEFINE_XEN_GUEST_HANDLE(name, type)
 #define DEFINE_XEN_GUEST_HANDLE(name) __DEFINE_XEN_GUEST_HANDLE(name, name)
 #define XEN_GUEST_HANDLE(name)        __guest_handle_ ## name
 #define set_xen_guest_handle(hnd, val) \
diff -r 51cbb2440b56 -r af903633d986 xen/include/public/arch-x86/xen-x86_32.h
--- a/xen/include/public/arch-x86/xen-x86_32.h  Fri Dec 28 15:47:10 2007 +0000
+++ b/xen/include/public/arch-x86/xen-x86_32.h  Fri Dec 28 15:52:50 2007 +0000
@@ -107,8 +107,8 @@
 
 /* 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)                   \
+#undef ___DEFINE_XEN_GUEST_HANDLE
+#define ___DEFINE_XEN_GUEST_HANDLE(name, type)                  \
     typedef struct { type *p; }                                 \
         __guest_handle_ ## name;                                \
     typedef struct { union { type *p; uint64_aligned_t q; }; }  \
diff -r 51cbb2440b56 -r af903633d986 xen/include/public/arch-x86/xen.h
--- a/xen/include/public/arch-x86/xen.h Fri Dec 28 15:47:10 2007 +0000
+++ b/xen/include/public/arch-x86/xen.h Fri Dec 28 15:52:50 2007 +0000
@@ -29,13 +29,15 @@
 
 /* Structural guest handles introduced in 0x00030201. */
 #if __XEN_INTERFACE_VERSION__ >= 0x00030201
+#define ___DEFINE_XEN_GUEST_HANDLE(name, type) \
+    typedef struct { type *p; } __guest_handle_ ## name
+#else
+#define ___DEFINE_XEN_GUEST_HANDLE(name, type) \
+    typedef type * __guest_handle_ ## name
+#endif
+
 #define __DEFINE_XEN_GUEST_HANDLE(name, type) \
-    typedef struct { type *p; } __guest_handle_ ## name
-#else
-#define __DEFINE_XEN_GUEST_HANDLE(name, type) \
-    typedef type * __guest_handle_ ## name
-#endif
-
+    ___DEFINE_XEN_GUEST_HANDLE(name, type)
 #define DEFINE_XEN_GUEST_HANDLE(name)   __DEFINE_XEN_GUEST_HANDLE(name, name)
 #define __XEN_GUEST_HANDLE(name)        __guest_handle_ ## name
 #define XEN_GUEST_HANDLE(name)          __XEN_GUEST_HANDLE(name)
diff -r 51cbb2440b56 -r af903633d986 xen/include/public/domctl.h
--- a/xen/include/public/domctl.h       Fri Dec 28 15:47:10 2007 +0000
+++ b/xen/include/public/domctl.h       Fri Dec 28 15:52:50 2007 +0000
@@ -37,7 +37,7 @@
 #define XEN_DOMCTL_INTERFACE_VERSION 0x00000005
 
 struct xenctl_cpumap {
-    XEN_GUEST_HANDLE_64(uint8_t) bitmap;
+    XEN_GUEST_HANDLE_64(uint8) bitmap;
     uint32_t nr_cpus;
 };
 
@@ -115,7 +115,7 @@ struct xen_domctl_getmemlist {
     uint64_aligned_t max_pfns;
     /* Start index in guest's page list. */
     uint64_aligned_t start_pfn;
-    XEN_GUEST_HANDLE_64(uint64_t) buffer;
+    XEN_GUEST_HANDLE_64(uint64) buffer;
     /* OUT variables. */
     uint64_aligned_t num_pfns;
 };
@@ -152,7 +152,7 @@ struct xen_domctl_getpageframeinfo2 {
     /* IN variables. */
     uint64_aligned_t num;
     /* IN/OUT variables. */
-    XEN_GUEST_HANDLE_64(uint32_t) array;
+    XEN_GUEST_HANDLE_64(uint32) array;
 };
 typedef struct xen_domctl_getpageframeinfo2 xen_domctl_getpageframeinfo2_t;
 DEFINE_XEN_GUEST_HANDLE(xen_domctl_getpageframeinfo2_t);
@@ -226,7 +226,7 @@ struct xen_domctl_shadow_op {
     uint32_t       mb;       /* Shadow memory allocation in MB */
 
     /* OP_PEEK / OP_CLEAN */
-    XEN_GUEST_HANDLE_64(uint8_t) dirty_bitmap;
+    XEN_GUEST_HANDLE_64(uint8) dirty_bitmap;
     uint64_aligned_t pages; /* Size of buffer. Updated with actual size. */
     struct xen_domctl_shadow_op_stats stats;
 };
@@ -397,10 +397,9 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_setti
 #define XEN_DOMCTL_sethvmcontext     34
 typedef struct xen_domctl_hvmcontext {
     uint32_t size; /* IN/OUT: size of buffer / bytes filled */
-    XEN_GUEST_HANDLE_64(uint8_t) buffer; /* IN/OUT: data, or call
-                                          * gethvmcontext with NULL
-                                          * buffer to get size
-                                          * req'd */
+    XEN_GUEST_HANDLE_64(uint8) buffer; /* IN/OUT: data, or call
+                                        * gethvmcontext with NULL
+                                        * buffer to get size req'd */
 } xen_domctl_hvmcontext_t;
 DEFINE_XEN_GUEST_HANDLE(xen_domctl_hvmcontext_t);
 
diff -r 51cbb2440b56 -r af903633d986 xen/include/public/physdev.h
--- a/xen/include/public/physdev.h      Fri Dec 28 15:47:10 2007 +0000
+++ b/xen/include/public/physdev.h      Fri Dec 28 15:52:50 2007 +0000
@@ -81,7 +81,7 @@ DEFINE_XEN_GUEST_HANDLE(physdev_set_iopl
 #define PHYSDEVOP_set_iobitmap           7
 struct physdev_set_iobitmap {
     /* IN */
-    XEN_GUEST_HANDLE_00030205(uint8_t) bitmap;
+    XEN_GUEST_HANDLE_00030205(uint8) bitmap;
     uint32_t nr_ports;
 };
 typedef struct physdev_set_iobitmap physdev_set_iobitmap_t;
diff -r 51cbb2440b56 -r af903633d986 xen/include/public/platform.h
--- a/xen/include/public/platform.h     Fri Dec 28 15:47:10 2007 +0000
+++ b/xen/include/public/platform.h     Fri Dec 28 15:52:50 2007 +0000
@@ -146,7 +146,7 @@ struct xenpf_firmware_info {
             uint8_t capabilities;
             uint8_t edid_transfer_time;
             /* must refer to 128-byte buffer */
-            XEN_GUEST_HANDLE(uint8_t) edid;
+            XEN_GUEST_HANDLE(uint8) edid;
         } vbeddc_info; /* XEN_FW_VBEDDC_INFO */
     } u;
 };
diff -r 51cbb2440b56 -r af903633d986 xen/include/public/xen.h
--- a/xen/include/public/xen.h  Fri Dec 28 15:47:10 2007 +0000
+++ b/xen/include/public/xen.h  Fri Dec 28 15:52:50 2007 +0000
@@ -577,10 +577,10 @@ typedef uint8_t xen_domain_handle_t[16];
 #define __mk_unsigned_long(x) x ## UL
 #define mk_unsigned_long(x) __mk_unsigned_long(x)
 
-DEFINE_XEN_GUEST_HANDLE(uint8_t);
-DEFINE_XEN_GUEST_HANDLE(uint16_t);
-DEFINE_XEN_GUEST_HANDLE(uint32_t);
-DEFINE_XEN_GUEST_HANDLE(uint64_t);
+__DEFINE_XEN_GUEST_HANDLE(uint8,  uint8_t);
+__DEFINE_XEN_GUEST_HANDLE(uint16, uint16_t);
+__DEFINE_XEN_GUEST_HANDLE(uint32, uint32_t);
+__DEFINE_XEN_GUEST_HANDLE(uint64, uint64_t);
 
 #else /* __ASSEMBLY__ */
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
[More with this subject...]
<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-3.1-testing] Rename uintN_t guest handles to uintN, to avoid nameclash with uintN_t, Xen patchbot-3.1-testing <=
Previous by Date:  [Xen-changelog] [xen-3.1-testing] Simplify APIC_ACCESS VMX support., Xen patchbot-3.1-testing
Next by Date:  [Xen-changelog] [xen-3.1-testing] xen vtpm: Initialize the comms ring with zeroes., Xen patchbot-3.1-testing
Previous by Thread:  [Xen-changelog] [xen-3.1-testing] Simplify APIC_ACCESS VMX support., Xen patchbot-3.1-testing
Next by Thread:  [Xen-changelog] [xen-3.1-testing] xen vtpm: Initialize the comms ring with zeroes., Xen patchbot-3.1-testing
Indexes:  [Date] [Thread] [Top] [All Lists]
 
   

Copyright , Citrix Systems Inc. All rights reserved. Legal and Privacy