[Xen-changelog] [xen-unstable] Cleanups for unmodified (pv-on-hvm) driver building.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxxx
# Date 1169818442 0
# Node ID fcaf34bc5e4129c4299e5db3be1a9cac3c0259ca
# Parent  16f7f5ac80ed601f06b0b2b3b2ec8472dd5aa0e2
Cleanups for unmodified (pv-on-hvm) driver building.

- some cleanup to mkbuildtree
- adjustment to the fake __supported_pte_mask definition (removing the
  export for x86-64 in native Linux is being discussed, so this shouldn't be
  i386 specific)
- remove odd/unused defines (mostly CONFIG_*) in overrides.mk

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h |   10 
+++++++---
 unmodified_drivers/linux-2.6/mkbuildtree                          |   10 
++++------
 unmodified_drivers/linux-2.6/overrides.mk                         |    4 ----
 3 files changed, 11 insertions(+), 13 deletions(-)

diff -r 16f7f5ac80ed -r fcaf34bc5e41 
unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h
--- a/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h Fri Jan 
26 13:31:59 2007 +0000
+++ b/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h Fri Jan 
26 13:34:02 2007 +0000
@@ -76,8 +76,12 @@ extern char *kasprintf(gfp_t gfp, const 
        __attribute__ ((format (printf, 2, 3)));
 #endif
 
-#if defined(_I386_PAGE_H) && defined(CONFIG_X86_PAE)
-#define __supported_pte_mask ~0ULL
-#endif
+/*
+ * This variable at present is referenced by netfront, but only in code that
+ * is dead when running in hvm guests. To detect potential active uses of it
+ * in the future, don't try to supply a 'valid' value here, so that any
+ * mappings created with it will fault when accessed.
+ */
+#define __supported_pte_mask ((maddr_t)0)
 
 #endif
diff -r 16f7f5ac80ed -r fcaf34bc5e41 unmodified_drivers/linux-2.6/mkbuildtree
--- a/unmodified_drivers/linux-2.6/mkbuildtree  Fri Jan 26 13:31:59 2007 +0000
+++ b/unmodified_drivers/linux-2.6/mkbuildtree  Fri Jan 26 13:34:02 2007 +0000
@@ -24,11 +24,7 @@ ln -sf ${XL}/drivers/xen/core/xen_proc.c
 ln -sf ${XL}/drivers/xen/core/xen_proc.c xenbus
 ln -sf ${XL}/drivers/xen/core/reboot.c util
 
-mkdir -p include
-mkdir -p include/xen
-mkdir -p include/public
-mkdir -p include/asm
-mkdir -p include/asm/xen
+mkdir -p include/asm include/xen
 
 lndir -silent ${XL}/include/xen include/xen
 ln -nsf ${XEN}/include/public include/xen/interface
@@ -43,7 +39,8 @@ in
     ln -sf ${XL}/include/asm-x86_64/mach-xen/asm/hypercall.h include/asm
     ln -sf ${XL}/include/asm-x86_64/mach-xen/asm/synch_bitops.h include/asm
     ln -sf ${XL}/include/asm-x86_64/mach-xen/asm/maddr.h include/asm
-    ln -sf ${XL}/include/asm-i386 include/asm-i386
+    mkdir include/asm-i386
+    lndir -silent ${XL}/include/asm-i386 include/asm-i386
   ;;
 i[34567]86)
     ln -sf ${XL}/include/asm-i386/mach-xen/asm/hypervisor.h include/asm
@@ -56,6 +53,7 @@ i[34567]86)
     ln -sf ${XL}/include/asm-ia64/hypercall.h include/asm
     ln -sf ${XL}/include/asm-ia64/synch_bitops.h include/asm
     ln -sf ${XL}/include/asm-ia64/maddr.h include/asm
+    mkdir include/asm/xen
     ln -sf ${XL}/include/asm-ia64/xen/xcom_hcall.h include/asm/xen
     ln -sf ${XL}/include/asm-ia64/xen/xencomm.h include/asm/xen
     ln -sf ${XL}/arch/ia64/xen/xcom_mini.c platform-pci
diff -r 16f7f5ac80ed -r fcaf34bc5e41 unmodified_drivers/linux-2.6/overrides.mk
--- a/unmodified_drivers/linux-2.6/overrides.mk Fri Jan 26 13:31:59 2007 +0000
+++ b/unmodified_drivers/linux-2.6/overrides.mk Fri Jan 26 13:34:02 2007 +0000
@@ -4,9 +4,5 @@
 #
 # (i.e. we need the native config for things like -mregparm, but
 # a Xen kernel to find the right headers)
-EXTRA_CFLAGS += -DCONFIG_VMX -DCONFIG_VMX_GUEST -DCONFIG_X86_XEN
-EXTRA_CFLAGS += -DCONFIG_XEN_SHADOW_MODE -DCONFIG_XEN_SHADOW_TRANSLATE
-EXTRA_CFLAGS += -DCONFIG_XEN_BLKDEV_GRANT -DXEN_EVTCHN_MASK_OPS
-EXTRA_CFLAGS += -DCONFIG_XEN_NETDEV_GRANT_RX -DCONFIG_XEN_NETDEV_GRANT_TX
 EXTRA_CFLAGS += -D__XEN_INTERFACE_VERSION__=0x00030202
 EXTRA_CFLAGS += -I$(M)/include -I$(M)/compat-include 
-DHAVE_XEN_PLATFORM_COMPAT_H

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