[PATCH] PV-GRUB: xfs support

[PATCH] PV-GRUB: xfs support

[Samuel Thibault]

PV-GRUB: xfs support

i386 doesn't have PAE anyway.

Index: fsys_xfs.c
===================================================================
RCS file: /sources/grub/grub/stage2/fsys_xfs.c,v
retrieving revision 1.5
diff -u -p -r1.5 fsys_xfs.c
--- fsys_xfs.c	8 May 2005 02:18:14 -0000	1.5
+++ fsys_xfs.c	10 Jul 2008 13:09:50 -0000
@@ -101,7 +101,7 @@ static inline __const__ xfs_uint16_t
 le16 (xfs_uint16_t x)
 {
 	__asm__("xchgb %b0,%h0"	\
-		: "=q" (x) \
+		: "=Q" (x) \
 		:  "0" (x)); \
 		return x;
 }
@@ -109,9 +109,9 @@ le16 (xfs_uint16_t x)
 static inline __const__ xfs_uint32_t
 le32 (xfs_uint32_t x)
 {
-#if 0
+#if 1
         /* 386 doesn't have bswap.  */
-	__asm__("bswap %0" : "=r" (x) : "0" (x));
+	__asm__("bswapl %k0" : "=r" (x) : "0" (x));
 #else
 	/* This is slower but this works on all x86 architectures.  */
 	__asm__("xchgb %b0, %h0" \

Re: [PATCH] PV-GRUB: xfs support

[Samuel Thibault]

Ooops, sorry, a real patch now :)


PV-GRUB: xfs support

i386 doesn't have PAE anyway.

diff -r 562e77f7112f stubdom/grub.patches/99minios
--- a/stubdom/grub.patches/99minios	Thu Jul 10 12:15:55 2008 +0100
+++ b/stubdom/grub.patches/99minios	Thu Jul 10 14:14:55 2008 +0100
@@ -1465,3 +1465,31 @@
  # endif /* SUPPORT_DISKLESS */
  
  static int preset_menu_offset;
+Index: grub/stage2/fsys_xfs.c
+===================================================================
+RCS file: /sources/grub/grub/stage2/fsys_xfs.c,v
+retrieving revision 1.5
+diff -u -p -r1.5 fsys_xfs.c
+--- grub/stage2/fsys_xfs.c	8 May 2005 02:18:14 -0000	1.5
++++ grub/stage2/fsys_xfs.c	10 Jul 2008 13:09:50 -0000
+@@ -101,7 +101,7 @@ static inline __const__ xfs_uint16_t
+ le16 (xfs_uint16_t x)
+ {
+ 	__asm__("xchgb %b0,%h0"	\
+-		: "=q" (x) \
++		: "=Q" (x) \
+ 		:  "0" (x)); \
+ 		return x;
+ }
+@@ -109,9 +109,9 @@ le16 (xfs_uint16_t x)
+ static inline __const__ xfs_uint32_t
+ le32 (xfs_uint32_t x)
+ {
+-#if 0
++#if 1
+         /* 386 doesn't have bswap.  */
+-	__asm__("bswap %0" : "=r" (x) : "0" (x));
++	__asm__("bswapl %k0" : "=r" (x) : "0" (x));
+ #else
+ 	/* This is slower but this works on all x86 architectures.  */
+ 	__asm__("xchgb %b0, %h0" \

Re: [PATCH] PV-GRUB: xfs support

[Samuel Thibault]

PV-GRUB: Enable xfs support

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>

diff -r 562e77f7112f stubdom/grub/Makefile
--- a/stubdom/grub/Makefile	Thu Jul 10 12:15:55 2008 +0100
+++ b/stubdom/grub/Makefile	Thu Jul 10 14:17:09 2008 +0100
@@ -51,10 +51,8 @@
 STAGE2_SOURCES+=fsys_vstafs.c
 CPPFLAGS += -DFSYS_VSTAFS=1
 
-ifeq (0,1)
 STAGE2_SOURCES+=fsys_xfs.c
 CPPFLAGS += -DFSYS_XFS=1
-endif
 
 STAGE2_SOURCES:=$(addprefix stage2/,$(STAGE2_SOURCES))
 NETBOOT_SOURCES:=$(addprefix netboot/,$(NETBOOT_SOURCES))