* [PATCH] x86: properly define size_t
@ 2012-01-12 12:40 Jan Beulich
2012-01-12 13:52 ` Christoph Egger
2012-01-12 14:08 ` Keir Fraser
0 siblings, 2 replies; 3+ messages in thread
From: Jan Beulich @ 2012-01-12 12:40 UTC (permalink / raw)
To: xen-devel@lists.xensource.com
[-- Attachment #1: Type: text/plain, Size: 1805 bytes --]
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@suse.com>
--- a/xen/arch/x86/microcode_amd.c
+++ b/xen/arch/x86/microcode_amd.c
@@ -183,10 +183,10 @@ static int get_next_ucode_from_buffer_am
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 @@ static int get_next_ucode_from_buffer_am
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 get_next_ucode_from_buffer_am
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];
--- a/xen/include/asm-x86/types.h
+++ b/xen/include/asm-x86/types.h
@@ -47,7 +47,13 @@ typedef unsigned long paddr_t;
#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)
[-- Attachment #2: x86-size_t.patch --]
[-- Type: text/plain, Size: 1830 bytes --]
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@suse.com>
--- a/xen/arch/x86/microcode_amd.c
+++ b/xen/arch/x86/microcode_amd.c
@@ -183,10 +183,10 @@ static int get_next_ucode_from_buffer_am
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 @@ static int get_next_ucode_from_buffer_am
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 get_next_ucode_from_buffer_am
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];
--- a/xen/include/asm-x86/types.h
+++ b/xen/include/asm-x86/types.h
@@ -47,7 +47,13 @@ typedef unsigned long paddr_t;
#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)
[-- Attachment #3: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] x86: properly define size_t
2012-01-12 12:40 [PATCH] x86: properly define size_t Jan Beulich
@ 2012-01-12 13:52 ` Christoph Egger
2012-01-12 14:08 ` Keir Fraser
1 sibling, 0 replies; 3+ messages in thread
From: Christoph Egger @ 2012-01-12 13:52 UTC (permalink / raw)
To: Jan Beulich; +Cc: xen-devel@lists.xensource.com
On 01/12/12 13:40, Jan Beulich wrote:
> 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@suse.com>
Acked-by: Christoph Egger <Christoph.Egger@amd.com>
>
> --- a/xen/arch/x86/microcode_amd.c
> +++ b/xen/arch/x86/microcode_amd.c
> @@ -183,10 +183,10 @@ static int get_next_ucode_from_buffer_am
> 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 @@ static int get_next_ucode_from_buffer_am
> 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 get_next_ucode_from_buffer_am
> 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];
>
> --- a/xen/include/asm-x86/types.h
> +++ b/xen/include/asm-x86/types.h
> @@ -47,7 +47,13 @@ typedef unsigned long paddr_t;
> #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)
>
>
>
--
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85689 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] x86: properly define size_t
2012-01-12 12:40 [PATCH] x86: properly define size_t Jan Beulich
2012-01-12 13:52 ` Christoph Egger
@ 2012-01-12 14:08 ` Keir Fraser
1 sibling, 0 replies; 3+ messages in thread
From: Keir Fraser @ 2012-01-12 14:08 UTC (permalink / raw)
To: Jan Beulich, xen-devel@lists.xensource.com
On 12/01/2012 12:40, "Jan Beulich" <JBeulich@suse.com> wrote:
> 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@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
> --- a/xen/arch/x86/microcode_amd.c
> +++ b/xen/arch/x86/microcode_amd.c
> @@ -183,10 +183,10 @@ static int get_next_ucode_from_buffer_am
> 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 @@ static int get_next_ucode_from_buffer_am
> 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 get_next_ucode_from_buffer_am
> 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];
>
> --- a/xen/include/asm-x86/types.h
> +++ b/xen/include/asm-x86/types.h
> @@ -47,7 +47,13 @@ typedef unsigned long paddr_t;
> #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-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-01-12 14:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-12 12:40 [PATCH] x86: properly define size_t Jan Beulich
2012-01-12 13:52 ` Christoph Egger
2012-01-12 14:08 ` Keir Fraser
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.