From patchwork Wed Feb 22 14:24:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 9586913 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2EA3B600CA for ; Wed, 22 Feb 2017 14:27:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10391286A1 for ; Wed, 22 Feb 2017 14:27:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 03E9E286B5; Wed, 22 Feb 2017 14:27:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 93445286A1 for ; Wed, 22 Feb 2017 14:27:24 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgXrJ-0000Ei-45; Wed, 22 Feb 2017 14:25:33 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgXrH-0000DE-7a for xen-devel@lists.xenproject.org; Wed, 22 Feb 2017 14:25:31 +0000 Received: from [85.158.143.35] by server-11.bemta-6.messagelabs.com id 0A/47-04971-A5F9DA85; Wed, 22 Feb 2017 14:25:30 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprJIsWRWlGSWpSXmKPExsXitHRDpK7H/LU RBq8+6Fp83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBlHj5UXXJWoOHNiJWMD406RLkZODgkBf4kX kx8zgthsAjoSF+fuZOti5OAQEVCRuL3XoIuRi4NZYAOjxLkfe9lB4sIC3hKTlkSClLMIqEosb G0Ga+UVsJR42NLEDDFST2LXkd+sIDangJXEqr7vjCCtQkA1V9dEQ5QLSpyc+YQFxGYW0JRo3f 6bHcKWl2jeOhtsjJCAokT/vAdsExj5ZiFpmYWkZRaSlgWMzKsY1YtTi8pSi3SN9ZKKMtMzSnI TM3N0DQ3M9HJTi4sT01NzEpOK9ZLzczcxAoOMAQh2MHb8czrEKMnBpCTK+zB7bYQQX1J+SmVG YnFGfFFpTmrxIUYZDg4lCV7heUA5waLU9NSKtMwcYLjDpCU4eJREeD1B0rzFBYm5xZnpEKlTj IpS4rwP5gIlBEASGaV5cG2wGLvEKCslzMsIdIgQT0FqUW5mCar8K0ZxDkYlYd51IFN4MvNK4K a/AlrMBLTY0hlscUkiQkqqgXHBq0bDAoa6u1tmemlm1kvPiH5kv1gonGX+1+xzDnzNhf2MnA9 z8lP/PtmQHtu2YdufLSbH2v4f/Dz3BRvL1JoOv8pNS48UPbvhsFaIJSAnO5Rd6sjO/k+6HI/v zV68cwFP1IRlEcVTC2d/Vfb/KaCZl2A6zfm4WV+Os97CvU9c9262/BW67YESS3FGoqEWc1FxI gC7nSszrAIAAA== X-Env-Sender: prvs=219821433=roger.pau@citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1487773510!52826058!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9810 invoked from network); 22 Feb 2017 14:25:12 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-4.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 22 Feb 2017 14:25:12 -0000 X-IronPort-AV: E=Sophos;i="5.35,194,1484006400"; d="scan'208";a="408869267" From: Roger Pau Monne To: Date: Wed, 22 Feb 2017 14:24:55 +0000 Message-ID: <20170222142459.28199-4-roger.pau@citrix.com> X-Mailer: git-send-email 2.10.1 (Apple Git-78) In-Reply-To: <20170222142459.28199-1-roger.pau@citrix.com> References: <20170222142459.28199-1-roger.pau@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , boris.ostrovsky@oracle.com, Roger Pau Monne , Jan Beulich Subject: [Xen-devel] [PATCH v7 3/7] x86/bzimage: change the types from char * to void * X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 --- Cc: Jan Beulich Cc: Andrew Cooper --- Changes since v6: - New in this version. --- 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 50ebb84..ac4fd42 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 adc4c00..aa1625a 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -1029,9 +1029,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 0bf5bca..7ed69d3 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__ */