From: Daniel Kiper <daniel.kiper@oracle.com>
To: xen-devel@lists.xenproject.org
Cc: jgross@suse.com, sstabellini@kernel.org, konrad.wilk@oracle.com,
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 v12 07/10] x86/setup: use XEN_IMG_OFFSET instead of...
Date: Fri, 20 Jan 2017 02:34:17 +0100 [thread overview]
Message-ID: <1484876060-2236-8-git-send-email-daniel.kiper@oracle.com> (raw)
In-Reply-To: <1484876060-2236-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>
Reviewed-by: Doug Goldstein <cardoe@cardoe.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 e6f6ef1..24b4b23 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:[~2017-01-20 1:35 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-20 1:34 [PATCH v12 00/10] x86: multiboot2 protocol support Daniel Kiper
2017-01-20 1:34 ` [PATCH v12 01/10] x86/boot: implement early command line parser in C Daniel Kiper
2017-01-20 16:37 ` Doug Goldstein
2017-01-20 16:41 ` Doug Goldstein
2017-01-20 1:34 ` [PATCH v12 02/10] x86: add multiboot2 protocol support Daniel Kiper
2017-01-20 16:52 ` Andrew Cooper
2017-01-20 17:24 ` Daniel Kiper
2017-01-20 18:07 ` Andrew Cooper
2017-01-20 19:01 ` Doug Goldstein
2017-01-20 1:34 ` [PATCH v12 03/10] efi: build xen.gz with EFI code Daniel Kiper
2017-01-20 1:34 ` [PATCH v12 04/10] efi: create new early memory allocator Daniel Kiper
2017-01-20 1:34 ` [PATCH v12 05/10] x86: add multiboot2 protocol support for EFI platforms Daniel Kiper
2017-01-20 4:37 ` Doug Goldstein
2017-01-20 9:46 ` Jan Beulich
2017-01-20 11:43 ` Daniel Kiper
2017-01-20 12:40 ` Jan Beulich
2017-01-20 13:46 ` Daniel Kiper
2017-01-20 14:10 ` Jan Beulich
2017-01-20 14:43 ` Daniel Kiper
2017-01-20 15:23 ` Jan Beulich
2017-01-20 19:04 ` Doug Goldstein
2017-01-20 19:05 ` Andrew Cooper
2017-01-20 19:34 ` Doug Goldstein
2017-01-20 21:42 ` Daniel Kiper
2017-01-20 1:34 ` [PATCH v12 06/10] x86: change default load address from 1 MiB to 2 MiB Daniel Kiper
2017-01-20 4:06 ` Doug Goldstein
2017-01-20 8:49 ` Jan Beulich
2017-01-20 10:29 ` Daniel Kiper
2017-01-20 1:34 ` Daniel Kiper [this message]
2017-01-20 4:07 ` [PATCH v12 07/10] x86/setup: use XEN_IMG_OFFSET instead of Doug Goldstein
2017-01-20 1:34 ` [PATCH v12 08/10] x86: make Xen early boot code relocatable Daniel Kiper
2017-01-20 1:34 ` [PATCH v12 09/10] x86/boot: rename sym_phys() to sym_offs() Daniel Kiper
2017-01-20 4:08 ` Doug Goldstein
2017-01-20 1:34 ` [PATCH v12 10/10] x86: add multiboot2 protocol support for relocatable images Daniel Kiper
2017-01-20 4:08 ` Doug Goldstein
2017-01-20 16:22 ` [PATCH v12 00/10] x86: multiboot2 protocol support Doug Goldstein
2017-01-20 17:21 ` Daniel Kiper
2017-01-20 18:53 ` Doug Goldstein
2017-01-20 19:28 ` Doug Goldstein
2017-01-20 19:42 ` Doug Goldstein
2017-01-20 19:52 ` Doug Goldstein
2017-01-20 20:01 ` Konrad Rzeszutek Wilk
2017-01-20 21:54 ` Daniel Kiper
2017-01-23 13:08 ` Daniel Kiper
2017-01-23 14:28 ` Konrad Rzeszutek Wilk
2017-01-23 16:03 ` Doug Goldstein
2017-01-23 18:12 ` Daniel Kiper
2017-01-23 15:35 ` Doug Goldstein
2017-01-23 15:45 ` Daniel Kiper
2017-01-23 16:07 ` Doug Goldstein
2017-01-23 18:16 ` 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=1484876060-2236-8-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=konrad.wilk@oracle.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).