From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= Subject: Re: [PATCH 1/5] xen/elfnotes: initialise phys_entry to UNSET_ADDR32 Date: Wed, 13 Jan 2016 13:52:17 +0100 Message-ID: <56964881.9000707@citrix.com> References: <1452688338-70075-1-git-send-email-roger.pau@citrix.com> <1452688338-70075-2-git-send-email-roger.pau@citrix.com> <5696553302000078000C649D@prv-mh.provo.novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aJKuV-0006I5-Ff for xen-devel@lists.xenproject.org; Wed, 13 Jan 2016 12:52:23 +0000 In-Reply-To: <5696553302000078000C649D@prv-mh.provo.novell.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Jan Beulich Cc: Ian Jackson , Wei Liu , Ian Campbell , xen-devel@lists.xenproject.org List-Id: xen-devel@lists.xenproject.org El 13/01/16 a les 13.46, Jan Beulich ha escrit: >>>> On 13.01.16 at 13:32, wrote: > > Re the title: I think the fix here really is to the checking against the > right value, not the initialization? Yes, the initialization doesn't matter much, the proper fix is the checking. I would change it to: xen/elfnotes: check phys_entry against UNSET_ADDR32 Which I think can be done by the committer (or I can resend if needed). >> tools/libxc/xc_dom_elfloader.c | 2 +- >> xen/common/libelf/libelf-dominfo.c | 1 + >> xen/include/xen/libelf.h | 1 + >> 3 files changed, 3 insertions(+), 1 deletion(-) > > With this diffstat, any reason only tools maintainers got Cc-ed? Hm, weird, that's what scripts/get_maintainer.pl gave me as output. > Contents: Acked-by: Jan Beulich > >> --- a/tools/libxc/xc_dom_elfloader.c >> +++ b/tools/libxc/xc_dom_elfloader.c >> @@ -57,7 +57,7 @@ static char *xc_dom_guest_type(struct xc_dom_image *dom, >> uint64_t machine = elf_uval(elf, elf->ehdr, e_machine); >> >> if ( dom->container_type == XC_DOM_HVM_CONTAINER && >> - dom->parms.phys_entry != UNSET_ADDR ) >> + dom->parms.phys_entry != UNSET_ADDR32 ) >> return "hvm-3.0-x86_32"; >> >> switch ( machine ) >> diff --git a/xen/common/libelf/libelf-dominfo.c >> b/xen/common/libelf/libelf-dominfo.c >> index 02d6cfb..ec69449 100644 >> --- a/xen/common/libelf/libelf-dominfo.c >> +++ b/xen/common/libelf/libelf-dominfo.c >> @@ -503,6 +503,7 @@ elf_errorstatus elf_xen_parse(struct elf_binary *elf, >> parms->virt_hv_start_low = UNSET_ADDR; >> parms->p2m_base = UNSET_ADDR; >> parms->elf_paddr_offset = UNSET_ADDR; >> + parms->phys_entry = UNSET_ADDR32; >> >> /* Find and parse elf notes. */ >> count = elf_phdr_count(elf); >> diff --git a/xen/include/xen/libelf.h b/xen/include/xen/libelf.h >> index 6da4cc0..95b5370 100644 >> --- a/xen/include/xen/libelf.h >> +++ b/xen/include/xen/libelf.h >> @@ -386,6 +386,7 @@ elf_errorstatus elf_reloc(struct elf_binary *elf); >> /* xc_libelf_dominfo.c >> */ >> >> #define UNSET_ADDR ((uint64_t)-1) >> +#define UNSET_ADDR32 ((uint32_t)-1) >> >> enum xen_elfnote_type { >> XEN_ENT_NONE = 0, >> -- >> 1.9.5 (Apple Git-50.3) >> >> >> _______________________________________________ >> Xen-devel mailing list >> Xen-devel@lists.xen.org >> http://lists.xen.org/xen-devel > > > >