From 7cb7fd9436ce2e7a25b2f7246a57f00bc1eafc29 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roger=20Pau=20Monn=C3=A9?= Date: Fri, 24 Feb 2017 15:47:36 +0100 Subject: [PATCH] x86/bzimage: change the types from char * to void * MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This allows to also change the types of image_base and image_start in the Dom0 builder from char * to void *. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/bzimage.c | 9 +++++---- xen/arch/x86/domain_build.c | 4 ++-- xen/include/asm-x86/bzimage.h | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/bzimage.c b/xen/arch/x86/bzimage.c index 50ebb84b93..ac4fd428be 100644 --- a/xen/arch/x86/bzimage.c +++ b/xen/arch/x86/bzimage.c @@ -9,9 +9,9 @@ #include #include -static __init unsigned long output_length(char *image, unsigned long image_len) +static __init unsigned long output_length(void *image, unsigned long image_len) { - return *(uint32_t *)&image[image_len - 4]; + return *(uint32_t *)(image + image_len - 4); } struct __packed setup_header { @@ -71,7 +71,7 @@ static __init int bzimage_check(struct setup_header *hdr, unsigned long len) static unsigned long __initdata orig_image_len; -unsigned long __init bzimage_headroom(char *image_start, +unsigned long __init bzimage_headroom(void *image_start, unsigned long image_length) { struct setup_header *hdr = (struct setup_header *)image_start; @@ -104,7 +104,8 @@ unsigned long __init bzimage_headroom(char *image_start, return headroom; } -int __init bzimage_parse(char *image_base, char **image_start, unsigned long *image_len) +int __init bzimage_parse(void *image_base, void **image_start, + unsigned long *image_len) { struct setup_header *hdr = (struct setup_header *)(*image_start); int err = bzimage_check(hdr, *image_len); diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 55b8981f3a..fc1d2784a4 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -1034,9 +1034,9 @@ static int __init construct_dom0_pv( start_info_t *si; struct vcpu *v = d->vcpu[0]; unsigned long long value; - char *image_base = bootstrap_map(image); + void *image_base = bootstrap_map(image); unsigned long image_len = image->mod_end; - char *image_start = image_base + image_headroom; + void *image_start = image_base + image_headroom; unsigned long initrd_len = initrd ? initrd->mod_end : 0; l4_pgentry_t *l4tab = NULL, *l4start = NULL; l3_pgentry_t *l3tab = NULL, *l3start = NULL; diff --git a/xen/include/asm-x86/bzimage.h b/xen/include/asm-x86/bzimage.h index 0bf5bca67a..7ed69d3910 100644 --- a/xen/include/asm-x86/bzimage.h +++ b/xen/include/asm-x86/bzimage.h @@ -3,9 +3,9 @@ #include -unsigned long bzimage_headroom(char *image_start, unsigned long image_length); +unsigned long bzimage_headroom(void *image_start, unsigned long image_length); -int bzimage_parse(char *image_base, char **image_start, +int bzimage_parse(void *image_base, void **image_start, unsigned long *image_len); #endif /* __X86_BZIMAGE_H__ */ -- 2.30.2