This series is a collection of xen kconfig fixes and additions. Andrew Jones (4): xen kconfig: keep XEN_XENBUS_FRONTEND builtin xen kconfig: relax INPUT_XEN_KBDDEV_FRONTEND deps xen kconfig: add dom0 support help text xen kconfig: describe xen tmem in the config menu arch/x86/xen/Kconfig | 7 ++++++- drivers/input/misc/Kconfig | 2 +- drivers/video/Kconfig | 1 + drivers/xen/Kconfig | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-) -- 1.7.7.5
Andrew Jones
2012-Jan-06 08:57 UTC
[PATCH 1/4] xen kconfig: keep XEN_XENBUS_FRONTEND builtin
When XEN_XENBUS_FRONTEND gets selected as a module it can lead to unbootable configs. If we need it, then we should just build it in. --- drivers/xen/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index 8795480..1d24061 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig @@ -118,7 +118,7 @@ config XEN_SYS_HYPERVISOR but will have no xen contents. config XEN_XENBUS_FRONTEND - tristate + bool config XEN_GNTDEV tristate "userspace grant access device driver" -- 1.7.7.5
Andrew Jones
2012-Jan-06 08:57 UTC
[PATCH 2/4] xen kconfig: relax INPUT_XEN_KBDDEV_FRONTEND deps
PV-on-HVM guests may want to use the xen keyboard/mouse frontend, but they don''t use the xen frame buffer frontend. For this case it doesn''t make much sense for INPUT_XEN_KBDDEV_FRONTEND to depend on XEN_FBDEV_FRONTEND. The opposite direction always makes more sense, i.e. if you''re using xenfb, then you''ll want xenkbd. Switch the dependencies. --- drivers/input/misc/Kconfig | 2 +- drivers/video/Kconfig | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index 22d875f..36c15bf 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig @@ -533,7 +533,7 @@ config INPUT_CMA3000_I2C config INPUT_XEN_KBDDEV_FRONTEND tristate "Xen virtual keyboard and mouse support" - depends on XEN_FBDEV_FRONTEND + depends on XEN default y select XEN_XENBUS_FRONTEND help diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index d83e967..269b299 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -2269,6 +2269,7 @@ config XEN_FBDEV_FRONTEND select FB_SYS_IMAGEBLIT select FB_SYS_FOPS select FB_DEFERRED_IO + select INPUT_XEN_KBDDEV_FRONTEND select XEN_XENBUS_FRONTEND default y help -- 1.7.7.5
Describe dom0 support in the config menu and supply help text for it. --- arch/x86/xen/Kconfig | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index 26c731a..88862d5 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -14,9 +14,14 @@ config XEN Xen hypervisor. config XEN_DOM0 - def_bool y + bool "Xen Initial Domain (Dom0) support" + default y depends on XEN && PCI_XEN && SWIOTLB_XEN depends on X86_LOCAL_APIC && X86_IO_APIC && ACPI && PCI + help + This allows the kernel to be used for the initial Xen domain, + Domain0. This is a privileged guest that supplies backends + and is used to manage the other Xen domains. # Dummy symbol since people have come to rely on the PRIVILEGED_GUEST # name in tools. -- 1.7.7.5
Andrew Jones
2012-Jan-06 08:57 UTC
[PATCH 4/4] xen kconfig: describe xen tmem in the config menu
Add a description to the config menu for xen tmem. --- drivers/xen/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index 1d24061..7e8d728 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig @@ -143,7 +143,7 @@ config SWIOTLB_XEN select SWIOTLB config XEN_TMEM - bool + bool "Xen Transcendent Memory (tmem)" default y if (CLEANCACHE || FRONTSWAP) help Shim to interface in-kernel Transcendent Memory hooks -- 1.7.7.5
Ian Campbell
2012-Jan-06 09:20 UTC
Re: [PATCH 3/4] xen kconfig: add dom0 support help text
On Fri, 2012-01-06 at 08:57 +0000, Andrew Jones wrote:> Describe dom0 support in the config menu and supply help text for it.This turns a non-user visible symbol into a user visible one. Previously if Xen was enabled and the other prerequisites were met you would get dom0 support automatically -- do we really want to change that? According to 6b0661a5e6fbf it was a deliberate decision to have it this way. BTW, you forgot a Signed-off-by and the appropriate CCs (please use MAINTAINERS or ./scripts/get-maintainer.pl). Ian.> --- > arch/x86/xen/Kconfig | 7 ++++++- > 1 files changed, 6 insertions(+), 1 deletions(-) > > diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig > index 26c731a..88862d5 100644 > --- a/arch/x86/xen/Kconfig > +++ b/arch/x86/xen/Kconfig > @@ -14,9 +14,14 @@ config XEN > Xen hypervisor. > > config XEN_DOM0 > - def_bool y > + bool "Xen Initial Domain (Dom0) support" > + default y > depends on XEN && PCI_XEN && SWIOTLB_XEN > depends on X86_LOCAL_APIC && X86_IO_APIC && ACPI && PCI > + help > + This allows the kernel to be used for the initial Xen domain, > + Domain0. This is a privileged guest that supplies backends > + and is used to manage the other Xen domains. > > # Dummy symbol since people have come to rely on the PRIVILEGED_GUEST > # name in tools.
Andrew Jones
2012-Jan-06 09:26 UTC
Re: [PATCH 3/4] xen kconfig: add dom0 support help text
----- Original Message -----> On Fri, 2012-01-06 at 08:57 +0000, Andrew Jones wrote: > > Describe dom0 support in the config menu and supply help text for > > it. > > This turns a non-user visible symbol into a user visible one. > Previously > if Xen was enabled and the other prerequisites were met you would get > dom0 support automatically -- do we really want to change that? > According to 6b0661a5e6fbf it was a deliberate decision to have it > this > way.I think it''s a necessary evil in order to give users the ability to compile kernels without the support. I know it doesn''t make much sense for most users, but...> > BTW, you forgot a Signed-off-by and the appropriate CCs (please use > MAINTAINERS or ./scripts/get-maintainer.pl). >Sorry, I''ll resend properly. Drew> Ian. > > > --- > > arch/x86/xen/Kconfig | 7 ++++++- > > 1 files changed, 6 insertions(+), 1 deletions(-) > > > > diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig > > index 26c731a..88862d5 100644 > > --- a/arch/x86/xen/Kconfig > > +++ b/arch/x86/xen/Kconfig > > @@ -14,9 +14,14 @@ config XEN > > Xen hypervisor. > > > > config XEN_DOM0 > > - def_bool y > > + bool "Xen Initial Domain (Dom0) support" > > + default y > > depends on XEN && PCI_XEN && SWIOTLB_XEN > > depends on X86_LOCAL_APIC && X86_IO_APIC && ACPI && PCI > > + help > > + This allows the kernel to be used for the initial Xen domain, > > + Domain0. This is a privileged guest that supplies backends > > + and is used to manage the other Xen domains. > > > > # Dummy symbol since people have come to rely on the > > PRIVILEGED_GUEST > > # name in tools. > > >
This series is a collection of xen kconfig fixes and additions. Andrew Jones (4): xen kconfig: keep XEN_XENBUS_FRONTEND builtin xen kconfig: relax INPUT_XEN_KBDDEV_FRONTEND deps xen kconfig: add dom0 support help text xen kconfig: describe xen tmem in the config menu arch/x86/xen/Kconfig | 7 ++++++- drivers/input/misc/Kconfig | 2 +- drivers/video/Kconfig | 1 + drivers/xen/Kconfig | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-) -- 1.7.7.5
Andrew Jones
2012-Jan-06 09:43 UTC
[PATCH 1/4] xen kconfig: keep XEN_XENBUS_FRONTEND builtin
When XEN_XENBUS_FRONTEND gets selected as a module it can lead to unbootable configs. If we need it, then we should just build it in. Signed-off-by: Andrew Jones <drjones@redhat.com> --- drivers/xen/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index 8795480..1d24061 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig @@ -118,7 +118,7 @@ config XEN_SYS_HYPERVISOR but will have no xen contents. config XEN_XENBUS_FRONTEND - tristate + bool config XEN_GNTDEV tristate "userspace grant access device driver" -- 1.7.7.5
Andrew Jones
2012-Jan-06 09:43 UTC
[PATCH 2/4] xen kconfig: relax INPUT_XEN_KBDDEV_FRONTEND deps
PV-on-HVM guests may want to use the xen keyboard/mouse frontend, but they don''t use the xen frame buffer frontend. For this case it doesn''t make much sense for INPUT_XEN_KBDDEV_FRONTEND to depend on XEN_FBDEV_FRONTEND. The opposite direction always makes more sense, i.e. if you''re using xenfb, then you''ll want xenkbd. Switch the dependencies. Signed-off-by: Andrew Jones <drjones@redhat.com> --- drivers/input/misc/Kconfig | 2 +- drivers/video/Kconfig | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index 22d875f..36c15bf 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig @@ -533,7 +533,7 @@ config INPUT_CMA3000_I2C config INPUT_XEN_KBDDEV_FRONTEND tristate "Xen virtual keyboard and mouse support" - depends on XEN_FBDEV_FRONTEND + depends on XEN default y select XEN_XENBUS_FRONTEND help diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index d83e967..269b299 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -2269,6 +2269,7 @@ config XEN_FBDEV_FRONTEND select FB_SYS_IMAGEBLIT select FB_SYS_FOPS select FB_DEFERRED_IO + select INPUT_XEN_KBDDEV_FRONTEND select XEN_XENBUS_FRONTEND default y help -- 1.7.7.5
Describe dom0 support in the config menu and supply help text for it. Signed-off-by: Andrew Jones <drjones@redhat.com> --- arch/x86/xen/Kconfig | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index 26c731a..88862d5 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -14,9 +14,14 @@ config XEN Xen hypervisor. config XEN_DOM0 - def_bool y + bool "Xen Initial Domain (Dom0) support" + default y depends on XEN && PCI_XEN && SWIOTLB_XEN depends on X86_LOCAL_APIC && X86_IO_APIC && ACPI && PCI + help + This allows the kernel to be used for the initial Xen domain, + Domain0. This is a privileged guest that supplies backends + and is used to manage the other Xen domains. # Dummy symbol since people have come to rely on the PRIVILEGED_GUEST # name in tools. -- 1.7.7.5
Andrew Jones
2012-Jan-06 09:43 UTC
[PATCH 4/4] xen kconfig: describe xen tmem in the config menu
Add a description to the config menu for xen tmem. Signed-off-by: Andrew Jones <drjones@redhat.com> --- drivers/xen/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index 1d24061..7e8d728 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig @@ -143,7 +143,7 @@ config SWIOTLB_XEN select SWIOTLB config XEN_TMEM - bool + bool "Xen Transcendent Memory (tmem)" default y if (CLEANCACHE || FRONTSWAP) help Shim to interface in-kernel Transcendent Memory hooks -- 1.7.7.5
Stefano Stabellini
2012-Jan-06 10:38 UTC
Re: [PATCH 2/4] xen kconfig: relax INPUT_XEN_KBDDEV_FRONTEND deps
On Fri, 6 Jan 2012, Andrew Jones wrote:> PV-on-HVM guests may want to use the xen keyboard/mouse frontend, but > they don''t use the xen frame buffer frontend. For this case it doesn''t > make much sense for INPUT_XEN_KBDDEV_FRONTEND to depend on > XEN_FBDEV_FRONTEND. The opposite direction always makes more sense, i.e. > if you''re using xenfb, then you''ll want xenkbd. Switch the dependencies.ack> --- > drivers/input/misc/Kconfig | 2 +- > drivers/video/Kconfig | 1 + > 2 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig > index 22d875f..36c15bf 100644 > --- a/drivers/input/misc/Kconfig > +++ b/drivers/input/misc/Kconfig > @@ -533,7 +533,7 @@ config INPUT_CMA3000_I2C > > config INPUT_XEN_KBDDEV_FRONTEND > tristate "Xen virtual keyboard and mouse support" > - depends on XEN_FBDEV_FRONTEND > + depends on XEN > default y > select XEN_XENBUS_FRONTEND > help > diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig > index d83e967..269b299 100644 > --- a/drivers/video/Kconfig > +++ b/drivers/video/Kconfig > @@ -2269,6 +2269,7 @@ config XEN_FBDEV_FRONTEND > select FB_SYS_IMAGEBLIT > select FB_SYS_FOPS > select FB_DEFERRED_IO > + select INPUT_XEN_KBDDEV_FRONTEND > select XEN_XENBUS_FRONTEND > default y > help > -- > 1.7.7.5 > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel >
Stefano Stabellini
2012-Jan-06 10:42 UTC
Re: [PATCH 2/4] xen kconfig: relax INPUT_XEN_KBDDEV_FRONTEND deps
On Fri, 6 Jan 2012, Stefano Stabellini wrote:> On Fri, 6 Jan 2012, Andrew Jones wrote: > > PV-on-HVM guests may want to use the xen keyboard/mouse frontend, but > > they don''t use the xen frame buffer frontend. For this case it doesn''t > > make much sense for INPUT_XEN_KBDDEV_FRONTEND to depend on > > XEN_FBDEV_FRONTEND. The opposite direction always makes more sense, i.e. > > if you''re using xenfb, then you''ll want xenkbd. Switch the dependencies. > > ackI meant to ack the version you sent with a signed-off-by line
Konrad Rzeszutek Wilk
2012-Jan-23 18:34 UTC
[PATCH 4/4] xen kconfig: describe xen tmem in the config menu
On Fri, Jan 06, 2012 at 10:43:11AM +0100, Andrew Jones wrote:> Add a description to the config menu for xen tmem.I am not sure what this patch gets us. If this is to minimize the size of the module - so say it gets loaded, but tmem-enabled is not set nor cleancache and we just have it consuming memory - we can do it via returning -ENODEV on the module load. Like this (completley untested nor compiled tested):