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, david.vrabel@citrix.com,
jbeulich@suse.com, qiaowei.ren@intel.com, gang.wei@intel.com,
fu.wei@linaro.org
Subject: [PATCH v6 12/15] x86/setup: use XEN_IMG_OFFSET instead of...
Date: Mon, 12 Sep 2016 22:18:27 +0200 [thread overview]
Message-ID: <1473711511-11931-13-git-send-email-daniel.kiper@oracle.com> (raw)
In-Reply-To: <1473711511-11931-1-git-send-email-daniel.kiper@oracle.com>
..calculating its value during runtime.
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.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 f19af6e..ca1a97a 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -901,7 +901,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. */
@@ -915,9 +914,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-09-12 20:21 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-12 20:18 [PATCH v6 00/15] x86: multiboot2 protocol support Daniel Kiper
2016-09-12 20:18 ` [PATCH v6 01/15] x86: properly calculate ELF end of image address Daniel Kiper
2016-09-16 20:43 ` Konrad Rzeszutek Wilk
2016-09-19 11:14 ` Jan Beulich
2016-09-19 13:56 ` Daniel Kiper
2016-09-19 14:52 ` Jan Beulich
2016-09-20 11:43 ` Daniel Kiper
2016-09-20 13:28 ` Jan Beulich
2016-09-20 18:00 ` Daniel Kiper
2016-09-21 9:37 ` Jan Beulich
2016-09-22 11:45 ` Daniel Kiper
2016-09-22 12:02 ` Jan Beulich
2016-09-19 11:18 ` Daniel Kiper
2016-09-12 20:18 ` [PATCH v6 02/15] x86/boot/reloc: create generic alloc and copy functions Daniel Kiper
2016-09-19 11:23 ` Jan Beulich
2016-09-12 20:18 ` [PATCH v6 03/15] x86/boot/reloc: rename some variables and rearrange code a bit Daniel Kiper
2016-09-12 20:18 ` [PATCH v6 04/15] x86: add multiboot2 protocol support Daniel Kiper
2016-09-19 11:42 ` Jan Beulich
2016-09-21 8:56 ` Daniel Kiper
2016-09-21 9:41 ` Jan Beulich
2016-09-12 20:18 ` [PATCH v6 05/15] efi: create efi_enabled() Daniel Kiper
2016-09-19 11:58 ` Jan Beulich
2016-09-19 14:27 ` Daniel Kiper
2016-09-19 14:31 ` Wei Liu
2016-09-19 14:57 ` Jan Beulich
2016-09-19 15:38 ` Daniel Kiper
2016-09-19 16:00 ` Jan Beulich
2016-09-12 20:18 ` [PATCH v6 06/15] x86: allow EFI reboot method neither on EFI platforms Daniel Kiper
2016-09-19 12:01 ` Jan Beulich
2016-09-12 20:18 ` [PATCH v6 07/15] efi: build xen.gz with EFI code Daniel Kiper
2016-09-12 20:18 ` [PATCH v6 08/15] x86/efi: create new early memory allocator Daniel Kiper
2016-09-19 12:12 ` Jan Beulich
2016-09-19 15:04 ` Daniel Kiper
2016-09-19 15:17 ` Jan Beulich
2016-09-20 9:45 ` Daniel Kiper
2016-09-20 9:57 ` Jan Beulich
2016-09-20 10:52 ` Daniel Kiper
2016-09-20 13:46 ` Jan Beulich
2016-09-20 18:45 ` Daniel Kiper
2016-09-21 9:42 ` Jan Beulich
2016-09-22 10:52 ` Daniel Kiper
2016-09-22 11:25 ` Jan Beulich
2016-09-22 12:07 ` Daniel Kiper
2016-09-22 13:12 ` Jan Beulich
2016-09-22 17:07 ` Julien Grall
2016-09-23 10:50 ` Daniel Kiper
2016-09-23 11:07 ` Julien Grall
2016-09-23 11:35 ` Daniel Kiper
2016-09-23 11:42 ` Julien Grall
2016-09-23 11:53 ` Daniel Kiper
2016-09-23 14:10 ` Jan Beulich
2016-09-12 20:18 ` [PATCH v6 09/15] x86: add multiboot2 protocol support for EFI platforms Daniel Kiper
2016-09-19 12:29 ` Jan Beulich
2016-09-19 15:18 ` Daniel Kiper
2016-09-19 15:28 ` Jan Beulich
2016-09-12 20:18 ` [PATCH v6 10/15] x86/boot: implement early command line parser in C Daniel Kiper
2016-09-19 12:47 ` Jan Beulich
2016-09-19 15:27 ` Daniel Kiper
2016-09-19 16:03 ` Jan Beulich
2016-09-20 9:49 ` Daniel Kiper
2016-09-20 10:05 ` Jan Beulich
2016-09-20 11:31 ` Daniel Kiper
2016-09-12 20:18 ` [PATCH v6 11/15] x86: change default load address from 1 MiB to 2 MiB Daniel Kiper
2016-09-19 12:54 ` Jan Beulich
2016-09-12 20:18 ` Daniel Kiper [this message]
2016-09-19 13:00 ` [PATCH v6 12/15] x86/setup: use XEN_IMG_OFFSET instead of Jan Beulich
2016-09-12 20:18 ` [PATCH v6 13/15] x86: make Xen early boot code relocatable Daniel Kiper
2016-09-12 20:18 ` [PATCH v6 14/15] x86/boot: rename sym_phys() to sym_offs() Daniel Kiper
2016-09-12 20:18 ` [PATCH v6 15/15] 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=1473711511-11931-13-git-send-email-daniel.kiper@oracle.com \
--to=daniel.kiper@oracle.com \
--cc=andrew.cooper3@citrix.com \
--cc=cardoe@cardoe.com \
--cc=david.vrabel@citrix.com \
--cc=fu.wei@linaro.org \
--cc=gang.wei@intel.com \
--cc=jbeulich@suse.com \
--cc=jgross@suse.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).