From: Daniel Kiper <daniel.kiper@oracle.com>
To: xen-devel@lists.xenproject.org
Cc: jgross@suse.com, sstabellini@kernel.org,
andrew.cooper3@citrix.com, cardoe@cardoe.com,
pgnet.dev@gmail.com, ning.sun@intel.com, julien.grall@arm.com,
jbeulich@suse.com, qiaowei.ren@intel.com, gang.wei@intel.com,
fu.wei@linaro.org
Subject: [PATCH v10 10/13] x86/setup: use XEN_IMG_OFFSET instead of...
Date: Wed, 30 Nov 2016 14:04:16 +0100 [thread overview]
Message-ID: <1480511059-14062-11-git-send-email-daniel.kiper@oracle.com> (raw)
In-Reply-To: <1480511059-14062-1-git-send-email-daniel.kiper@oracle.com>
..calculating its value during runtime.
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---
xen/arch/x86/setup.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index fa808ef..5d0830e 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -943,7 +943,6 @@ void __init noreturn __start_xen(unsigned long mbi_p)
l4_pgentry_t *pl4e;
l3_pgentry_t *pl3e;
l2_pgentry_t *pl2e;
- uint64_t load_start;
int i, j, k;
/* Select relocation address. */
@@ -957,9 +956,8 @@ void __init noreturn __start_xen(unsigned long mbi_p)
* with a barrier(). After this we must *not* modify static/global
* data until after we have switched to the relocated pagetables!
*/
- load_start = (unsigned long)_start - XEN_VIRT_START;
barrier();
- move_memory(e + load_start, load_start, _end - _start, 1);
+ move_memory(e + XEN_IMG_OFFSET, XEN_IMG_OFFSET, _end - _start, 1);
/* Walk initial pagetables, relocating page directory entries. */
pl4e = __va(__pa(idle_pg_table));
--
1.7.10.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-11-30 13:05 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-30 13:04 [PATCH v10 00/13] x86: multiboot2 protocol support Daniel Kiper
2016-11-30 13:04 ` [PATCH v10 01/13] x86: add " Daniel Kiper
2016-11-30 13:04 ` [PATCH v10 02/13] efi: create efi_enabled() Daniel Kiper
2016-11-30 13:04 ` [PATCH v10 03/13] x86: allow EFI reboot method neither on EFI platforms Daniel Kiper
2016-11-30 13:04 ` [PATCH v10 04/13] x86: properly calculate xen ELF end of image address Daniel Kiper
2016-11-30 13:04 ` [PATCH v10 05/13] efi: build xen.gz with EFI code Daniel Kiper
2016-11-30 13:04 ` [PATCH v10 06/13] efi: create new early memory allocator Daniel Kiper
2016-12-01 13:13 ` Jan Beulich
2016-12-01 15:41 ` Daniel Kiper
2016-12-01 16:08 ` Jan Beulich
2016-12-01 16:19 ` Daniel Kiper
2016-11-30 13:04 ` [PATCH v10 07/13] x86: add multiboot2 protocol support for EFI platforms Daniel Kiper
2016-11-30 13:04 ` [PATCH v10 08/13] x86/boot: implement early command line parser in C Daniel Kiper
2016-11-30 13:04 ` [PATCH v10 09/13] x86: change default load address from 1 MiB to 2 MiB Daniel Kiper
2016-11-30 13:51 ` Juergen Gross
2016-11-30 14:03 ` Juergen Gross
2016-11-30 13:04 ` Daniel Kiper [this message]
2016-11-30 13:04 ` [PATCH v10 11/13] x86: make Xen early boot code relocatable Daniel Kiper
2016-11-30 13:04 ` [PATCH v10 12/13] x86/boot: rename sym_phys() to sym_offs() Daniel Kiper
2016-11-30 13:04 ` [PATCH v10 13/13] x86: add multiboot2 protocol support for relocatable images Daniel Kiper
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=1480511059-14062-11-git-send-email-daniel.kiper@oracle.com \
--to=daniel.kiper@oracle.com \
--cc=andrew.cooper3@citrix.com \
--cc=cardoe@cardoe.com \
--cc=fu.wei@linaro.org \
--cc=gang.wei@intel.com \
--cc=jbeulich@suse.com \
--cc=jgross@suse.com \
--cc=julien.grall@arm.com \
--cc=ning.sun@intel.com \
--cc=pgnet.dev@gmail.com \
--cc=qiaowei.ren@intel.com \
--cc=sstabellini@kernel.org \
--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).