From patchwork Thu Aug 4 08:32:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 9262929 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 4D99C6048F for ; Thu, 4 Aug 2016 08:35:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D94D281DB for ; Thu, 4 Aug 2016 08:35:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3216828327; Thu, 4 Aug 2016 08:35:36 +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 CDE98281DB for ; Thu, 4 Aug 2016 08:35:33 +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 1bVE53-0005bM-Kw; Thu, 04 Aug 2016 08:32:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bVE51-0005bE-Q4 for xen-devel@lists.xenproject.org; Thu, 04 Aug 2016 08:32:39 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 15/72-17024-6ADF2A75; Thu, 04 Aug 2016 08:32:38 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrKIsWRWlGSWpSXmKPExsXS6fjDS3fZ30X hBr/XsFl83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBkPni1hLpiqXXFi12LmBsaLSl2MnBxCAnkS jScfsoLYvAJ2EhtWvmEEsSUEDCWevr/OBmKzCKhKXFpwnAnEZhNQl2h7th2onoNDRMBA4tzRp C5GLg5mgbVMEhdn3QWrERZwkzi9eBMTSA2vgKDE3x3CIGFmoPFT7j9jmcDINQshMwtJBsLWkn j46xaUrS2xbOFrZpByZgFpieX/OCBMe4mNV9VQVYDYXhJr9jxnW8DIsYpRozi1qCy1SNfIUi+ pKDM9oyQ3MTNH19DQRC83tbg4MT01JzGpWC85P3cTIzD46hkYGHcw7jrud4hRkoNJSZQ3J3VR uBBfUn5KZUZicUZ8UWlOavEhRhkODiUJ3su/gXKCRanpqRVpmTnAOIBJS3DwKInw7gRJ8xYXJ OYWZ6ZDpE4xKkqJ83L8AUoIgCQySvPg2mCxd4lRVkqYl5GBgUGIpyC1KDezBFX+FaM4B6OSMK 8AyBSezLwSuOmvgBYzAS0+YbAAZHFJIkJKqoFRKnAXW2rawsBjxRfCJ6b+2xJ8SGbZ2wUBbJZ BubcWpfQfbth7JeLjhu3P/jZ7epW3Pp44dUc9i+Bnjh0f1Xe8/3k7QWgV5+Mw64mPLCY+stv9 fMG3/2n/XnzbUahw4ovh6wdBK9qv7jE8dblt/oam6Xz2Sif/M3tuXbnce9GDJZf9t51JSdtQk KXEUpyRaKjFXFScCAAtfPYZuAIAAA== X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1470299555!57784740!1 X-Originating-IP: [137.65.248.74] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 8.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7078 invoked from network); 4 Aug 2016 08:32:37 -0000 Received: from prv-mh.provo.novell.com (HELO prv-mh.provo.novell.com) (137.65.248.74) by server-13.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 4 Aug 2016 08:32:37 -0000 Received: from INET-PRV-MTA by prv-mh.provo.novell.com with Novell_GroupWise; Thu, 04 Aug 2016 02:32:35 -0600 Message-Id: <57A319C2020000780010296E@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.1 Date: Thu, 04 Aug 2016 02:32:34 -0600 From: "Jan Beulich" To: "xen-devel" Mime-Version: 1.0 Cc: Stefano Stabellini , Wei Liu , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan Subject: [Xen-devel] [PATCH] libelf: drop struct elf_dom_parms' virt_offset member 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 It's being used solely by elf_xen_addr_calc_check(), and hence can be a local variable there. Signed-off-by: Jan Beulich libelf: drop struct elf_dom_parms' virt_offset member It's being used solely by elf_xen_addr_calc_check(), and hence can be a local variable there. Signed-off-by: Jan Beulich --- a/xen/common/libelf/libelf-dominfo.c +++ b/xen/common/libelf/libelf-dominfo.c @@ -404,6 +404,8 @@ static elf_errorstatus elf_xen_note_chec static elf_errorstatus elf_xen_addr_calc_check(struct elf_binary *elf, struct elf_dom_parms *parms) { + uint64_t virt_offset; + if ( (parms->elf_paddr_offset != UNSET_ADDR) && (parms->virt_base == UNSET_ADDR) ) { @@ -439,9 +441,9 @@ static elf_errorstatus elf_xen_addr_calc __FUNCTION__, parms->elf_paddr_offset); } - parms->virt_offset = parms->virt_base - parms->elf_paddr_offset; - parms->virt_kstart = elf->pstart + parms->virt_offset; - parms->virt_kend = elf->pend + parms->virt_offset; + virt_offset = parms->virt_base - parms->elf_paddr_offset; + parms->virt_kstart = elf->pstart + virt_offset; + parms->virt_kend = elf->pend + virt_offset; if ( parms->virt_entry == UNSET_ADDR ) parms->virt_entry = elf_uval(elf, elf->ehdr, e_entry); @@ -450,13 +452,13 @@ static elf_errorstatus elf_xen_addr_calc { elf_parse_bsdsyms(elf, elf->pend); if ( elf->bsd_symtab_pend ) - parms->virt_kend = elf->bsd_symtab_pend + parms->virt_offset; + parms->virt_kend = elf->bsd_symtab_pend + virt_offset; } elf_msg(elf, "%s: addresses:\n", __FUNCTION__); elf_msg(elf, " virt_base = 0x%" PRIx64 "\n", parms->virt_base); elf_msg(elf, " elf_paddr_offset = 0x%" PRIx64 "\n", parms->elf_paddr_offset); - elf_msg(elf, " virt_offset = 0x%" PRIx64 "\n", parms->virt_offset); + elf_msg(elf, " virt_offset = 0x%" PRIx64 "\n", virt_offset); elf_msg(elf, " virt_kstart = 0x%" PRIx64 "\n", parms->virt_kstart); elf_msg(elf, " virt_kend = 0x%" PRIx64 "\n", parms->virt_kend); elf_msg(elf, " virt_entry = 0x%" PRIx64 "\n", parms->virt_entry); --- a/xen/include/xen/libelf.h +++ b/xen/include/xen/libelf.h @@ -428,7 +428,6 @@ struct elf_dom_parms { uint32_t phys_entry; /* calculated */ - uint64_t virt_offset; uint64_t virt_kstart; uint64_t virt_kend; }; Reviewed-by: Andrew Cooper --- a/xen/common/libelf/libelf-dominfo.c +++ b/xen/common/libelf/libelf-dominfo.c @@ -404,6 +404,8 @@ static elf_errorstatus elf_xen_note_chec static elf_errorstatus elf_xen_addr_calc_check(struct elf_binary *elf, struct elf_dom_parms *parms) { + uint64_t virt_offset; + if ( (parms->elf_paddr_offset != UNSET_ADDR) && (parms->virt_base == UNSET_ADDR) ) { @@ -439,9 +441,9 @@ static elf_errorstatus elf_xen_addr_calc __FUNCTION__, parms->elf_paddr_offset); } - parms->virt_offset = parms->virt_base - parms->elf_paddr_offset; - parms->virt_kstart = elf->pstart + parms->virt_offset; - parms->virt_kend = elf->pend + parms->virt_offset; + virt_offset = parms->virt_base - parms->elf_paddr_offset; + parms->virt_kstart = elf->pstart + virt_offset; + parms->virt_kend = elf->pend + virt_offset; if ( parms->virt_entry == UNSET_ADDR ) parms->virt_entry = elf_uval(elf, elf->ehdr, e_entry); @@ -450,13 +452,13 @@ static elf_errorstatus elf_xen_addr_calc { elf_parse_bsdsyms(elf, elf->pend); if ( elf->bsd_symtab_pend ) - parms->virt_kend = elf->bsd_symtab_pend + parms->virt_offset; + parms->virt_kend = elf->bsd_symtab_pend + virt_offset; } elf_msg(elf, "%s: addresses:\n", __FUNCTION__); elf_msg(elf, " virt_base = 0x%" PRIx64 "\n", parms->virt_base); elf_msg(elf, " elf_paddr_offset = 0x%" PRIx64 "\n", parms->elf_paddr_offset); - elf_msg(elf, " virt_offset = 0x%" PRIx64 "\n", parms->virt_offset); + elf_msg(elf, " virt_offset = 0x%" PRIx64 "\n", virt_offset); elf_msg(elf, " virt_kstart = 0x%" PRIx64 "\n", parms->virt_kstart); elf_msg(elf, " virt_kend = 0x%" PRIx64 "\n", parms->virt_kend); elf_msg(elf, " virt_entry = 0x%" PRIx64 "\n", parms->virt_entry); --- a/xen/include/xen/libelf.h +++ b/xen/include/xen/libelf.h @@ -428,7 +428,6 @@ struct elf_dom_parms { uint32_t phys_entry; /* calculated */ - uint64_t virt_offset; uint64_t virt_kstart; uint64_t virt_kend; };