WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

Re: [Xen-devel] [PATCH] take a bite out of xen-mkbuildtree-pre

To: xen-devel@xxxxxxxxxxxxxxxxxxx
Subject: Re: [Xen-devel] [PATCH] take a bite out of xen-mkbuildtree-pre
From: Aron Griffis <aron@xxxxxx>
Date: Wed, 24 May 2006 21:37:07 -0400
Delivery-date: Wed, 24 May 2006 18:37:45 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
In-reply-to: <20060524235813.GC13661@xxxxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Mail-followup-to: xen-devel@xxxxxxxxxxxxxxxxxxx
References: <20060524235813.GC13661@xxxxxxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mutt/1.5.11
This version is slightly better.  It keeps some pollution out of
.config if CONFIG_XEN=n.  Otherwise it's just a repost of the previous
patch...

This patch takes a bite out of xen-mkbuildtree-pre, which needs to
disappear eventually for inclusion of xen-ia64 in Fedora.  Probably
these config settings will disappear when the ia64 p2m/vp conversion
is complete, but for the moment it's a clean way of handling the two
personalities of xen-ia64.

This is sent to xen-devel because it's primarily common code that's
changing.

Signed-off-by: Aron Griffis <aron@xxxxxx>

# HG changeset patch
# User agriffis@xxxxxxxxxxxxxxxxx
# Node ID daa8345dbe73c5c02c1167fffbc902229f746baa
# Parent  35f2341bfac8bb74ad2ca7e7f71f6c0663bb3e36
Converge the ia64-specific and general versions of xen/drivers/Makefile and
xen/drivers/core/Makefile.  Use Kconfig settings instead to control whether
specific pieces are built.  This takes a bite out of xen-mkbuildtree-pre, which
needs to disappear eventually for distro inclusion.

diff -r 35f2341bfac8 -r daa8345dbe73 linux-2.6-xen-sparse/arch/ia64/Kconfig
--- a/linux-2.6-xen-sparse/arch/ia64/Kconfig    Wed May 24 09:59:04 2006 -0600
+++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig    Wed May 24 21:42:02 2006 -0400
@@ -73,7 +73,7 @@ config XEN_IA64_DOM0_VP
 
 config XEN_IA64_DOM0_NON_VP
        bool
-       depends on !(XEN && XEN_IA64_DOM0_VP)
+       depends on XEN && !XEN_IA64_DOM0_VP
        default y
        help
          dom0 P=M model
@@ -496,15 +496,33 @@ source "security/Kconfig"
 
 source "crypto/Kconfig"
 
+#
 # override default values of drivers/xen/Kconfig
-if !XEN_IA64_DOM0_VP
+#
+if XEN
+config XEN_UTIL
+       default n if XEN_IA64_DOM0_VP
+
 config HAVE_ARCH_ALLOC_SKB
-        bool
-        default n
+       default n if !XEN_IA64_DOM0_VP
 
 config HAVE_ARCH_DEV_ALLOC_SKB
-        bool
-        default n
+       default n if !XEN_IA64_DOM0_VP
+
+config XEN_NETUTIL
+       default n if !XEN_IA64_DOM0_VP
+
+config XEN_BALLOON
+       default n if !XEN_IA64_DOM0_VP
+
+config XEN_SKBUFF
+       default n if !XEN_IA64_DOM0_VP
+
+config XEN_CHAR
+       default n
+
+config XEN_REBOOT
+       default n
 endif
 
 source "drivers/xen/Kconfig"
diff -r 35f2341bfac8 -r daa8345dbe73 
linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre
--- a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre        Wed May 24 
09:59:04 2006 -0600
+++ b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre        Wed May 24 
21:42:02 2006 -0400
@@ -9,12 +9,6 @@
 
 #eventually asm-xsi-offsets needs to be part of hypervisor.h/hypercall.h
 ln -sf ../../../../xen/include/asm-ia64/asm-xsi-offsets.h include/asm-ia64/xen/
-
-#ia64 drivers/xen isn't fully functional yet, workaround...
-#also ignore core/evtchn.c which uses a different irq mechanism than ia64
-#(warning: there be dragons here if these files diverge)
-ln -sf ../../arch/ia64/xen/drivers/Makefile drivers/xen/Makefile
-ln -sf ../../../arch/ia64/xen/drivers/coreMakefile drivers/xen/core/Makefile
 
 #not sure where these ia64-specific files will end up in the future
 ln -sf ../../../arch/ia64/xen/drivers/xenia64_init.c drivers/xen/core
diff -r 35f2341bfac8 -r daa8345dbe73 linux-2.6-xen-sparse/drivers/xen/Kconfig
--- a/linux-2.6-xen-sparse/drivers/xen/Kconfig  Wed May 24 09:59:04 2006 -0600
+++ b/linux-2.6-xen-sparse/drivers/xen/Kconfig  Wed May 24 21:42:02 2006 -0400
@@ -228,4 +228,29 @@ config NO_IDLE_HZ
        bool
        default y
 
+config XEN_UTIL
+       bool
+       default y
+
+config XEN_NETUTIL
+       bool
+       default y
+
+config XEN_BALLOON
+       bool
+       default y
+
+config XEN_CHAR
+       bool
+       default y
+
+config XEN_SKBUFF
+       bool
+       default y
+       depends on NET
+
+config XEN_REBOOT
+       bool
+       default y
+
 endif
diff -r 35f2341bfac8 -r daa8345dbe73 linux-2.6-xen-sparse/drivers/xen/Makefile
--- a/linux-2.6-xen-sparse/drivers/xen/Makefile Wed May 24 09:59:04 2006 -0600
+++ b/linux-2.6-xen-sparse/drivers/xen/Makefile Wed May 24 21:42:02 2006 -0400
@@ -1,15 +1,13 @@
-
-obj-y  += net_driver_util.o
-obj-y  += util.o
-
 obj-y  += core/
-obj-y  += char/
 obj-y  += console/
 obj-y  += evtchn/
-obj-y  += balloon/
 obj-y  += privcmd/
 obj-y  += xenbus/
 
+obj-$(CONFIG_XEN_UTIL)                 += util.o
+obj-$(CONFIG_XEN_NETUTIL)              += net_driver_util.o
+obj-$(CONFIG_XEN_BALLOON)              += balloon/
+obj-$(CONFIG_XEN_CHAR)                 += char/
 obj-$(CONFIG_XEN_BLKDEV_BACKEND)       += blkback/
 obj-$(CONFIG_XEN_NETDEV_BACKEND)       += netback/
 obj-$(CONFIG_XEN_TPMDEV_BACKEND)       += tpmback/
diff -r 35f2341bfac8 -r daa8345dbe73 
linux-2.6-xen-sparse/drivers/xen/core/Makefile
--- a/linux-2.6-xen-sparse/drivers/xen/core/Makefile    Wed May 24 09:59:04 
2006 -0600
+++ b/linux-2.6-xen-sparse/drivers/xen/core/Makefile    Wed May 24 21:42:02 
2006 -0400
@@ -2,10 +2,12 @@
 # Makefile for the linux kernel.
 #
 
-obj-y   := evtchn.o reboot.o gnttab.o features.o
+obj-y   := evtchn.o gnttab.o features.o
 
-obj-$(CONFIG_PROC_FS) += xen_proc.o
-obj-$(CONFIG_NET)     += skbuff.o
-obj-$(CONFIG_SMP)     += smpboot.o
-obj-$(CONFIG_SYSFS)   += hypervisor_sysfs.o
+obj-$(CONFIG_PROC_FS)  += xen_proc.o
+obj-$(CONFIG_SYSFS)    += hypervisor_sysfs.o
 obj-$(CONFIG_XEN_SYSFS) += xen_sysfs.o
+obj-$(CONFIG_IA64)     += xenia64_init.o
+obj-$(CONFIG_XEN_SKBUFF)       += skbuff.o
+obj-$(CONFIG_XEN_REBOOT)       += reboot.o
+obj-$(CONFIG_XEN_SMPBOOT)      += smpboot.o

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