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

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1303146527 -3600
# Node ID 024b06de81caad72465a942e0f2f7feb30e322a0
# Parent  5e445a5a8eefceb0bee403e91322aa9f825e6975
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>
---


diff -r 5e445a5a8eef -r 024b06de81ca tools/firmware/hvmloader/config.h
--- a/tools/firmware/hvmloader/config.h Mon Apr 18 17:24:21 2011 +0100
+++ b/tools/firmware/hvmloader/config.h Mon Apr 18 18:08:47 2011 +0100
@@ -63,10 +63,11 @@
 #define RESERVED_MEMBASE    0xfc000000
 #define RESERVED_MEMSIZE    0x01000000
 
+/* Memory map. */
 #define SCRATCH_PHYSICAL_ADDRESS      0x00010000
 #define HYPERCALL_PHYSICAL_ADDRESS    0x00080000
-
 #define VGABIOS_PHYSICAL_ADDRESS      0x000C0000
+#define HVMLOADER_PHYSICAL_ADDRESS    0x00100000
 
 #endif /* __HVMLOADER_CONFIG_H__ */
 
diff -r 5e445a5a8eef -r 024b06de81ca tools/firmware/hvmloader/hypercall.h
--- a/tools/firmware/hvmloader/hypercall.h      Mon Apr 18 17:24:21 2011 +0100
+++ b/tools/firmware/hvmloader/hypercall.h      Mon Apr 18 18:08:47 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