[Xen-changelog] [xen-4.1-testing] hvmloader: Fix _start-relative calculation of hypercall page address.

[Xen patchbot-4.1-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1303734809 -3600
# Node ID 0545ae0f5c900e62c3e509c2739b0a36d025b957
# Parent  60ac4cfdf4a8b97819265afbc55d0ac0044937bf
hvmloader: Fix _start-relative calculation of hypercall page address.

We got away with it because _start-HYPERCALL_PHYSICAL_ADDRESS happens
to equal HYPERCALL_PHYSICAL_ADDRESS.

Signed-off-by: Keir Fraser <keir@xxxxxxx>
xen-unstable changeset:   23244:024b06de81ca
xen-unstable date:        Mon Apr 18 18:08:47 2011 +0100
---


diff -r 60ac4cfdf4a8 -r 0545ae0f5c90 tools/firmware/hvmloader/config.h
--- a/tools/firmware/hvmloader/config.h Mon Apr 25 13:31:10 2011 +0100
+++ b/tools/firmware/hvmloader/config.h Mon Apr 25 13:33:29 2011 +0100
@@ -41,6 +41,7 @@
 #define SMBIOS_PHYSICAL_ADDRESS       0x000EB000
 #define SMBIOS_MAXIMUM_SIZE           0x00005000
 #define ROMBIOS_PHYSICAL_ADDRESS      0x000F0000
+#define HVMLOADER_PHYSICAL_ADDRESS    0x00100000
 
 /* Offsets from E820_PHYSICAL_ADDRESS. */
 #define E820_NR_OFFSET                0x0
diff -r 60ac4cfdf4a8 -r 0545ae0f5c90 tools/firmware/hvmloader/hypercall.h
--- a/tools/firmware/hvmloader/hypercall.h      Mon Apr 25 13:31:10 2011 +0100
+++ b/tools/firmware/hvmloader/hypercall.h      Mon Apr 25 13:33:29 2011 +0100
@@ -39,7 +39,8 @@
  * NB. Hypercall address needs to be relative to a linkage symbol for
  * some version of ld to relocate the relative calls properly.
  */
-#define hypercall_pa "_start - " STR(HYPERCALL_PHYSICAL_ADDRESS)
+#define hypercall_pa "_start - " STR(HVMLOADER_PHYSICAL_ADDRESS) \
+                           " + " STR(HYPERCALL_PHYSICAL_ADDRESS)
 
 #define _hypercall0(type, name)                                                
\
 ({                                                                     \

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog