* Re: [Xen-changelog] [linux-2.6.18-xen] xen: make gntdev code configurable
[not found] <200712122150.lBCLob6m007818@xenbits.xensource.com>
@ 2007-12-13 2:55 ` Kurt C. Hackel
0 siblings, 0 replies; only message in thread
From: Kurt C. Hackel @ 2007-12-13 2:55 UTC (permalink / raw)
To: xen-devel
Hi,
Looks like this patch broke automated builds due to a lack of a matching
line in the defconfigs. Below is a patch that makes this a module for
xen and xen0, unconfigured for xenU. That might not be the best thing
here however.
Thanks
kurt
Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
=====================================================
diff -r cd744c5ec950 buildconfigs/linux-defconfig_xen0_ia64
--- a/buildconfigs/linux-defconfig_xen0_ia64 Wed Dec 12 10:18:35 2007 +0000
+++ b/buildconfigs/linux-defconfig_xen0_ia64 Wed Dec 12 18:19:45 2007 -0800
@@ -1677,6 +1677,7 @@ CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_NETDEV_FRONTEND=y
CONFIG_XEN_FRAMEBUFFER=y
+CONFIG_XEN_GRANT_DEV=m
CONFIG_XEN_KEYBOARD=y
# CONFIG_XEN_SCRUB_PAGES is not set
CONFIG_XEN_DISABLE_SERIAL=y
diff -r cd744c5ec950 buildconfigs/linux-defconfig_xen0_x86_32
--- a/buildconfigs/linux-defconfig_xen0_x86_32 Wed Dec 12 10:18:35 2007 +0000
+++ b/buildconfigs/linux-defconfig_xen0_x86_32 Wed Dec 12 18:20:15 2007 -0800
@@ -1429,6 +1429,7 @@ CONFIG_XEN_SMPBOOT=y
CONFIG_XEN_SMPBOOT=y
CONFIG_XEN_BALLOON=y
CONFIG_XEN_DEVMEM=y
+CONFIG_XEN_GRANT_DEV=m
#
# Library routines
diff -r cd744c5ec950 buildconfigs/linux-defconfig_xen0_x86_64
--- a/buildconfigs/linux-defconfig_xen0_x86_64 Wed Dec 12 10:18:35 2007 +0000
+++ b/buildconfigs/linux-defconfig_xen0_x86_64 Wed Dec 12 18:29:59 2007 -0800
@@ -1376,6 +1376,7 @@ CONFIG_NO_IDLE_HZ=y
CONFIG_NO_IDLE_HZ=y
CONFIG_XEN_BALLOON=y
CONFIG_XEN_DEVMEM=y
+CONFIG_XEN_GRANT_DEV=m
#
# Library routines
diff -r cd744c5ec950 buildconfigs/linux-defconfig_xenU_ia64
--- a/buildconfigs/linux-defconfig_xenU_ia64 Wed Dec 12 10:18:35 2007 +0000
+++ b/buildconfigs/linux-defconfig_xenU_ia64 Wed Dec 12 18:21:04 2007 -0800
@@ -1500,3 +1500,4 @@ CONFIG_NO_IDLE_HZ=y
CONFIG_NO_IDLE_HZ=y
CONFIG_XEN_BALLOON=y
CONFIG_XEN_XENCOMM=y
+# CONFIG_XEN_GRANT_DEV is not set
diff -r cd744c5ec950 buildconfigs/linux-defconfig_xenU_x86_32
--- a/buildconfigs/linux-defconfig_xenU_x86_32 Wed Dec 12 10:18:35 2007 +0000
+++ b/buildconfigs/linux-defconfig_xenU_x86_32 Wed Dec 12 18:21:14 2007 -0800
@@ -928,6 +928,7 @@ CONFIG_XEN_SMPBOOT=y
CONFIG_XEN_SMPBOOT=y
CONFIG_XEN_BALLOON=y
CONFIG_XEN_DEVMEM=y
+# CONFIG_XEN_GRANT_DEV is not set
#
# Library routines
diff -r cd744c5ec950 buildconfigs/linux-defconfig_xenU_x86_64
--- a/buildconfigs/linux-defconfig_xenU_x86_64 Wed Dec 12 10:18:35 2007 +0000
+++ b/buildconfigs/linux-defconfig_xenU_x86_64 Wed Dec 12 18:21:19 2007 -0800
@@ -1225,6 +1225,7 @@ CONFIG_XEN_SMPBOOT=y
CONFIG_XEN_SMPBOOT=y
CONFIG_XEN_BALLOON=y
CONFIG_XEN_DEVMEM=y
+# CONFIG_XEN_GRANT_DEV is not set
#
# Library routines
diff -r cd744c5ec950 buildconfigs/linux-defconfig_xen_ia64
--- a/buildconfigs/linux-defconfig_xen_ia64 Wed Dec 12 10:18:35 2007 +0000
+++ b/buildconfigs/linux-defconfig_xen_ia64 Wed Dec 12 18:19:21 2007 -0800
@@ -1677,6 +1677,7 @@ CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_NETDEV_FRONTEND=y
CONFIG_XEN_FRAMEBUFFER=y
+CONFIG_XEN_GRANT_DEV=m
CONFIG_XEN_KEYBOARD=y
# CONFIG_XEN_SCRUB_PAGES is not set
CONFIG_XEN_DISABLE_SERIAL=y
diff -r cd744c5ec950 buildconfigs/linux-defconfig_xen_x86_32
--- a/buildconfigs/linux-defconfig_xen_x86_32 Wed Dec 12 10:18:35 2007 +0000
+++ b/buildconfigs/linux-defconfig_xen_x86_32 Wed Dec 12 18:18:52 2007 -0800
@@ -3274,6 +3274,7 @@ CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_NETDEV_FRONTEND=y
CONFIG_XEN_FRAMEBUFFER=y
+CONFIG_XEN_GRANT_DEV=m
CONFIG_XEN_KEYBOARD=y
CONFIG_XEN_SCRUB_PAGES=y
CONFIG_XEN_DISABLE_SERIAL=y
diff -r cd744c5ec950 buildconfigs/linux-defconfig_xen_x86_64
--- a/buildconfigs/linux-defconfig_xen_x86_64 Wed Dec 12 10:18:35 2007 +0000
+++ b/buildconfigs/linux-defconfig_xen_x86_64 Wed Dec 12 16:46:20 2007 -0800
@@ -3105,6 +3105,7 @@ CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_NETDEV_FRONTEND=y
CONFIG_XEN_FRAMEBUFFER=y
+CONFIG_XEN_GRANT_DEV=m
CONFIG_XEN_KEYBOARD=y
CONFIG_XEN_SCRUB_PAGES=y
CONFIG_XEN_DISABLE_SERIAL=y
=====================================================
Xen patchbot-linux-2.6.18-xen wrote:
> # HG changeset patch
> # User Keir Fraser <keir.fraser@citrix.com>
> # Date 1197454529 0
> # Node ID 9d7607f2307088d50986c34d7aebb59fb2cae3a2
> # Parent 05c57da2fcff6c32aced3e5b72c8d66229d427c6
> xen: make gntdev code configurable
> Signed-off-by: Jan Beulich <jbeulich@novell.com>
> ---
> drivers/xen/Kconfig | 7 +++++++
> drivers/xen/Makefile | 2 +-
> drivers/xen/gntdev/Makefile | 2 +-
> 3 files changed, 9 insertions(+), 2 deletions(-)
>
> diff -r 05c57da2fcff -r 9d7607f23070 drivers/xen/Kconfig
> --- a/drivers/xen/Kconfig Wed Dec 12 10:14:47 2007 +0000
> +++ b/drivers/xen/Kconfig Wed Dec 12 10:15:29 2007 +0000
> @@ -187,6 +187,13 @@ config XEN_NETDEV_FRONTEND
> dedicated device-driver domain, or your master control domain
> (domain 0), then you almost certainly want to say Y here.
>
> +config XEN_GRANT_DEV
> + tristate "User-space granted page access driver"
> + default XEN_PRIVILEGED_GUEST
> + help
> + Device for accessing (in user-space) pages that have been granted
> + by other domains.
> +
> config XEN_FRAMEBUFFER
> tristate "Framebuffer-device frontend driver"
> depends on XEN && FB
> diff -r 05c57da2fcff -r 9d7607f23070 drivers/xen/Makefile
> --- a/drivers/xen/Makefile Wed Dec 12 10:14:47 2007 +0000
> +++ b/drivers/xen/Makefile Wed Dec 12 10:15:29 2007 +0000
> @@ -2,7 +2,6 @@ obj-y += console/
> obj-y += console/
> obj-y += evtchn/
> obj-y += xenbus/
> -obj-y += gntdev/
> obj-y += char/
>
> obj-y += util.o
> @@ -18,3 +17,4 @@ obj-$(CONFIG_XEN_FRAMEBUFFER) += fbfron
> obj-$(CONFIG_XEN_FRAMEBUFFER) += fbfront/
> obj-$(CONFIG_XEN_KEYBOARD) += fbfront/
> obj-$(CONFIG_XEN_PRIVCMD) += privcmd/
> +obj-$(CONFIG_XEN_GRANT_DEV) += gntdev/
> diff -r 05c57da2fcff -r 9d7607f23070 drivers/xen/gntdev/Makefile
> --- a/drivers/xen/gntdev/Makefile Wed Dec 12 10:14:47 2007 +0000
> +++ b/drivers/xen/gntdev/Makefile Wed Dec 12 10:15:29 2007 +0000
> @@ -1,1 +1,1 @@ obj-y := gntdev.o
> -obj-y := gntdev.o
> +obj-$(CONFIG_XEN_GRANT_DEV) := gntdev.o
>
> _______________________________________________
> Xen-changelog mailing list
> Xen-changelog@lists.xensource.com
> http://lists.xensource.com/xen-changelog
>
^ permalink raw reply [flat|nested] only message in thread