From: Roger Pau Monne <roger.pau@citrix.com>
To: xen-devel@lists.xenproject.org
Cc: Wei Liu <wei.liu2@citrix.com>,
Ian Jackson <ian.jackson@eu.citrix.com>,
Ian Campbell <ian.campbell@citrix.com>,
Roger Pau Monne <roger.pau@citrix.com>
Subject: [PATCH 1/5] xen/elfnotes: initialise phys_entry to UNSET_ADDR32
Date: Wed, 13 Jan 2016 13:32:14 +0100 [thread overview]
Message-ID: <1452688338-70075-2-git-send-email-roger.pau@citrix.com> (raw)
In-Reply-To: <1452688338-70075-1-git-send-email-roger.pau@citrix.com>
And introduce UNSET_ADDR32.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
---
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(-)
diff --git a/tools/libxc/xc_dom_elfloader.c b/tools/libxc/xc_dom_elfloader.c
index 2ae575e..5039f3f 100644
--- 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
next prev parent reply other threads:[~2016-01-13 12:33 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-13 12:32 [PATCH 0/5] HVMlite: minor fixes and Dom0 preparatory patches Roger Pau Monne
2016-01-13 12:32 ` Roger Pau Monne [this message]
2016-01-13 12:46 ` [PATCH 1/5] xen/elfnotes: initialise phys_entry to UNSET_ADDR32 Jan Beulich
2016-01-13 12:52 ` Roger Pau Monné
2016-01-13 13:02 ` Jan Beulich
2016-01-13 13:05 ` Andrew Cooper
2016-01-13 13:08 ` Jan Beulich
2016-01-13 13:10 ` Andrew Cooper
2016-01-13 12:32 ` [PATCH 2/5] libelf: rewrite symtab/strtab loading for Dom0 Roger Pau Monne
2016-01-13 12:32 ` [PATCH 3/5] x86/hvm: don't set the BSP as initialised in hvm_vcpu_initialise Roger Pau Monne
2016-01-13 16:29 ` Jan Beulich
2016-01-13 17:23 ` Roger Pau Monné
2016-01-14 9:07 ` Jan Beulich
2016-01-13 12:32 ` [PATCH 4/5] x86/PV: remove the emulated PIT Roger Pau Monne
2016-01-13 16:36 ` Jan Beulich
2016-01-14 8:25 ` Roger Pau Monné
2016-01-14 9:11 ` Jan Beulich
2016-01-14 10:59 ` Roger Pau Monné
2016-01-14 12:38 ` Jan Beulich
2016-01-14 14:03 ` Roger Pau Monné
2016-01-14 14:36 ` Jan Beulich
2016-01-13 12:32 ` [PATCH 5/5] x86/HVM: don't setup an intercept handler for IO port 0xcf8 unconditionally Roger Pau Monne
2016-01-13 16:38 ` Jan Beulich
2016-01-13 16:45 ` Andrew Cooper
2016-01-13 16:48 ` Paul Durrant
2016-01-14 8:35 ` Roger Pau Monné
2016-01-14 9:12 ` Jan Beulich
2016-01-14 10:50 ` Andrew Cooper
2016-01-14 11:00 ` Roger Pau Monné
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1452688338-70075-2-git-send-email-roger.pau@citrix.com \
--to=roger.pau@citrix.com \
--cc=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).