[Xen-changelog] [xen-unstable] x86: properly define size_t

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxx>
# Date 1326383139 -3600
# Node ID c362e0526e5d0adfd886a4603cc1024cd9d16329
# Parent  ac8e624d3dbbc15cf5dc4e6607b299f1773ec4b0
x86: properly define size_t

Having it defined unilaterally as 'unsigned long' got me surprised
recently when I tried to use the 'z' printk type modifier, as that is
expected by the compiler to be used only on the type it knows size_t
is supposed to have.

Generally the compiler provides a construct to do this, so use it when
available.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Acked-by: Keir Fraser <keir@xxxxxxx>
Acked-by: Christoph Egger <Christoph.Egger@xxxxxxx>
---


diff -r ac8e624d3dbb -r c362e0526e5d xen/arch/x86/microcode_amd.c
--- a/xen/arch/x86/microcode_amd.c      Thu Jan 12 16:43:55 2012 +0100
+++ b/xen/arch/x86/microcode_amd.c      Thu Jan 12 16:45:39 2012 +0100
@@ -183,10 +183,10 @@
     struct microcode_amd *mc_amd,
     const void *buf,
     size_t bufsize,
-    unsigned long *offset)
+    size_t *offset)
 {
     const uint8_t *bufp = buf;
-    unsigned long off;
+    size_t off;
     const struct mpbhdr *mpbuf;
 
     off = *offset;
@@ -203,7 +203,7 @@
         return -EINVAL;
     }
 
-    printk(KERN_DEBUG "microcode: size %lu, block size %u, offset %ld\n",
+    printk(KERN_DEBUG "microcode: size %zu, block size %u, offset %zu\n",
            bufsize, mpbuf->len, off);
 
     if ( (off + mpbuf->len) > bufsize )
@@ -234,7 +234,7 @@
 static int install_equiv_cpu_table(
     struct microcode_amd *mc_amd,
     const uint32_t *buf,
-    unsigned long *offset)
+    size_t *offset)
 {
     const struct mpbhdr *mpbuf = (const struct mpbhdr *)&buf[1];
 
diff -r ac8e624d3dbb -r c362e0526e5d xen/include/asm-x86/types.h
--- a/xen/include/asm-x86/types.h       Thu Jan 12 16:43:55 2012 +0100
+++ b/xen/include/asm-x86/types.h       Thu Jan 12 16:45:39 2012 +0100
@@ -47,7 +47,13 @@
 #define PRIpaddr "016lx"
 #endif
 
+#if defined(__SIZE_TYPE__)
+typedef __SIZE_TYPE__ size_t;
+#elif defined(__i386__)
+typedef unsigned int size_t;
+#else
 typedef unsigned long size_t;
+#endif
 
 typedef char bool_t;
 #define test_and_set_bool(b)   xchg(&(b), 1)

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