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 v11 10/13] x86/setup: use XEN_IMG_OFFSET instead of...
Date: Mon, 5 Dec 2016 23:25:15 +0100 [thread overview]
Message-ID: <1480976718-12198-11-git-send-email-daniel.kiper@oracle.com> (raw)
In-Reply-To: <1480976718-12198-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-12-05 22:26 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-05 22:25 [PATCH v11 00/13] x86: multiboot2 protocol support Daniel Kiper
2016-12-05 22:25 ` [PATCH v11 01/13] x86: add " Daniel Kiper
2017-01-10 1:21 ` Doug Goldstein
2017-01-10 8:38 ` Jan Beulich
2017-01-10 15:19 ` Doug Goldstein
2016-12-05 22:25 ` [PATCH v11 02/13] efi: create efi_enabled() Daniel Kiper
2016-12-05 22:25 ` [PATCH v11 03/13] x86: allow EFI reboot method neither on EFI platforms Daniel Kiper
2016-12-07 13:18 ` Jan Beulich
2016-12-07 17:25 ` Daniel Kiper
2017-01-10 1:24 ` Doug Goldstein
2017-01-10 8:21 ` Jan Beulich
2016-12-05 22:25 ` [PATCH v11 04/13] x86: properly calculate xen ELF end of image address Daniel Kiper
2016-12-05 22:25 ` [PATCH v11 05/13] efi: build xen.gz with EFI code Daniel Kiper
2016-12-05 22:25 ` [PATCH v11 06/13] efi: create new early memory allocator Daniel Kiper
2016-12-06 8:27 ` Jan Beulich
2016-12-09 18:03 ` Julien Grall
2016-12-12 14:27 ` Daniel Kiper
2016-12-05 22:25 ` [PATCH v11 07/13] x86: add multiboot2 protocol support for EFI platforms Daniel Kiper
2016-12-16 13:38 ` Andrew Cooper
2016-12-16 13:50 ` Jan Beulich
2017-01-10 1:37 ` Doug Goldstein
2017-01-10 20:51 ` Doug Goldstein
2017-01-11 19:47 ` Daniel Kiper
2017-01-11 20:20 ` Doug Goldstein
2017-01-12 10:22 ` Jan Beulich
2017-01-12 12:50 ` Daniel Kiper
2017-01-12 15:52 ` Doug Goldstein
2017-01-12 20:28 ` Daniel Kiper
2017-01-12 22:23 ` Doug Goldstein
2017-01-13 0:04 ` Daniel Kiper
2017-01-13 0:35 ` Doug Goldstein
2017-01-13 0:37 ` Doug Goldstein
2017-01-11 19:08 ` Daniel Kiper
2017-01-11 19:50 ` Doug Goldstein
2017-01-11 20:36 ` Daniel Kiper
2017-01-11 20:31 ` Doug Goldstein
2017-01-12 12:18 ` Daniel Kiper
2017-01-12 15:44 ` Doug Goldstein
2017-01-12 19:30 ` Daniel Kiper
2017-01-12 19:46 ` Doug Goldstein
2017-01-12 21:45 ` Daniel Kiper
2017-01-12 22:20 ` Doug Goldstein
2017-01-12 23:44 ` Daniel Kiper
2016-12-05 22:25 ` [PATCH v11 08/13] x86/boot: implement early command line parser in C Daniel Kiper
2016-12-07 13:43 ` Jan Beulich
2016-12-07 17:27 ` Daniel Kiper
2016-12-08 23:08 ` Daniel Kiper
2016-12-09 8:19 ` Jan Beulich
2016-12-09 13:32 ` Daniel Kiper
2016-12-05 22:25 ` [PATCH v11 09/13] x86: change default load address from 1 MiB to 2 MiB Daniel Kiper
2016-12-05 22:25 ` Daniel Kiper [this message]
2016-12-05 22:25 ` [PATCH v11 11/13] x86: make Xen early boot code relocatable Daniel Kiper
2017-01-10 2:05 ` Doug Goldstein
2017-01-11 20:05 ` Daniel Kiper
2017-01-11 20:23 ` Doug Goldstein
2016-12-05 22:25 ` [PATCH v11 12/13] x86/boot: rename sym_phys() to sym_offs() Daniel Kiper
2016-12-05 22:25 ` [PATCH v11 13/13] x86: add multiboot2 protocol support for relocatable images Daniel Kiper
2016-12-16 15:59 ` [PATCH v11 00/13] x86: multiboot2 protocol support Doug Goldstein
2017-01-10 23:12 ` [PATCH 2/??] memory allocation fix Doug Goldstein
2017-01-11 20:46 ` [PATCH v11 00/13] x86: multiboot2 protocol support Daniel Kiper
2017-01-13 15:45 ` Doug Goldstein
2017-01-13 16:18 ` Daniel Kiper
2017-01-12 17:46 ` Doug Goldstein
2017-01-12 18:26 ` 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=1480976718-12198-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).