[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [PATCH 1/5] xen/elfnotes: initialise phys_entry to UNSET_ADDR32
>>> On 13.01.16 at 13:32, <roger.pau@xxxxxxxxxx> wrote: Re the title: I think the fix here really is to the checking against the right value, not the initialization? > 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? Contents: Acked-by: Jan Beulich <jbeulich@xxxxxxxx> > --- 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@xxxxxxxxxxxxx > http://lists.xen.org/xen-devel _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |