[Xen-changelog] [xen-4.0-testing] multiboot asm: Get offset constants from the C struct

["Xen patchbot-4.0-testing" <patchbot-4.0-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1273481728 -3600
# Node ID 6b5eb168e3f963e68af126643647cb0236c5905c
# Parent  7404865abab684586bee827032df5c222d8eb184
multiboot asm: Get offset constants from the C struct

Signed-off-by: Xiao Guangrong <xiaoguangrong@xxxxxxxxxxxxxx>
xen-unstable changeset:   21325:535bf8e72dd2
xen-unstable date:        Fri May 07 10:00:43 2010 +0100
---
 xen/arch/x86/boot/cmdline.S       |    4 ----
 xen/arch/x86/x86_32/asm-offsets.c |    5 +++++
 xen/arch/x86/x86_64/asm-offsets.c |    5 +++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff -r 7404865abab6 -r 6b5eb168e3f9 xen/arch/x86/boot/cmdline.S
--- a/xen/arch/x86/boot/cmdline.S       Mon May 10 09:55:05 2010 +0100
+++ b/xen/arch/x86/boot/cmdline.S       Mon May 10 09:55:28 2010 +0100
@@ -147,10 +147,6 @@ 3:      pop     %ebx
 3:      pop     %ebx
         ret
 
-/* multiboot_info structure offsets. */
-#define MB_flags   0
-#define MB_cmdline 16
-
 cmdline_parse_early:
         pusha
 
diff -r 7404865abab6 -r 6b5eb168e3f9 xen/arch/x86/x86_32/asm-offsets.c
--- a/xen/arch/x86/x86_32/asm-offsets.c Mon May 10 09:55:05 2010 +0100
+++ b/xen/arch/x86/x86_32/asm-offsets.c Mon May 10 09:55:28 2010 +0100
@@ -9,6 +9,7 @@
 #include <xen/sched.h>
 #include <asm/fixmap.h>
 #include <asm/hardirq.h>
+#include <xen/multiboot.h>
 
 #define DEFINE(_sym, _val) \
     __asm__ __volatile__ ( "\n->" #_sym " %0 " #_val : : "i" (_val) )
@@ -127,4 +128,8 @@ void __dummy__(void)
     BLANK();
 
     OFFSET(CPUINFO_ext_features, struct cpuinfo_x86, x86_capability[1]);
+    BLANK();
+
+    OFFSET(MB_flags, multiboot_info_t, flags);
+    OFFSET(MB_cmdline, multiboot_info_t, cmdline);
 }
diff -r 7404865abab6 -r 6b5eb168e3f9 xen/arch/x86/x86_64/asm-offsets.c
--- a/xen/arch/x86/x86_64/asm-offsets.c Mon May 10 09:55:05 2010 +0100
+++ b/xen/arch/x86/x86_64/asm-offsets.c Mon May 10 09:55:28 2010 +0100
@@ -10,6 +10,7 @@
 #include <compat/xen.h>
 #include <asm/fixmap.h>
 #include <asm/hardirq.h>
+#include <xen/multiboot.h>
 
 #define DEFINE(_sym, _val) \
     __asm__ __volatile__ ( "\n->" #_sym " %0 " #_val : : "i" (_val) )
@@ -151,4 +152,8 @@ void __dummy__(void)
     BLANK();
 
     OFFSET(CPUINFO_ext_features, struct cpuinfo_x86, x86_capability[1]);
+    BLANK();
+
+    OFFSET(MB_flags, multiboot_info_t, flags);
+    OFFSET(MB_cmdline, multiboot_info_t, cmdline);
 }

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