<stefano.stabellini@eu.citrix.com>
2011-Sep-27 17:05 UTC
[Xen-devel] [PATCH 1/2] xen: XEN_PVHVM depends on PCI
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Xen PV on HVM guests require PCI support because they need the
xen-platform-pci driver in order to initialize xenbus.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
arch/x86/xen/Kconfig | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
index 5cc821c..e061f55 100644
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@ -25,8 +25,7 @@ config XEN_PRIVILEGED_GUEST
config XEN_PVHVM
def_bool y
- depends on XEN
- depends on X86_LOCAL_APIC
+ depends on XEN && PCI && X86_LOCAL_APIC
config XEN_MAX_DOMAIN_MEMORY
int
--
1.7.2.3
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
<stefano.stabellini@eu.citrix.com>
2011-Sep-27 17:05 UTC
[Xen-devel] [PATCH 2/2] xen: remove XEN_PLATFORM_PCI config option
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Xen PVHVM needs xen-platform-pci, on the other hand xen-platform-pci is useless in any other cases. Therefore remove the XEN_PLATFORM_PCI config option and compile xen-platform-pci built-in if XEN_PVHVM is selected. Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> --- drivers/xen/Kconfig | 10 ---------- drivers/xen/Makefile | 2 +- 2 files changed, 1 insertions(+), 11 deletions(-) diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index 5f7ff8e..8795480 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig @@ -137,16 +137,6 @@ config XEN_GRANT_DEV_ALLOC to other domains. This can be used to implement frontend drivers or as part of an inter-domain shared memory channel. -config XEN_PLATFORM_PCI - tristate "xen platform pci device driver" - depends on XEN_PVHVM && PCI - default m - help - Driver for the Xen PCI Platform device: it is responsible for - initializing xenbus and grant_table when running in a Xen HVM - domain. As a consequence this driver is required to run any Xen PV - frontend on Xen HVM. - config SWIOTLB_XEN def_bool y depends on PCI diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 72bbb27..d8dc26a 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -14,7 +14,7 @@ obj-$(CONFIG_XEN_GNTDEV) += xen-gntdev.o obj-$(CONFIG_XEN_GRANT_DEV_ALLOC) += xen-gntalloc.o obj-$(CONFIG_XENFS) += xenfs/ obj-$(CONFIG_XEN_SYS_HYPERVISOR) += sys-hypervisor.o -obj-$(CONFIG_XEN_PLATFORM_PCI) += xen-platform-pci.o +obj-$(CONFIG_XEN_PVHVM) += xen-platform-pci.o obj-$(CONFIG_XEN_TMEM) += tmem.o obj-$(CONFIG_SWIOTLB_XEN) += swiotlb-xen.o obj-$(CONFIG_XEN_DOM0) += pci.o -- 1.7.2.3 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Jeremy Fitzhardinge
2011-Sep-27 17:23 UTC
[Xen-devel] Re: [PATCH 2/2] xen: remove XEN_PLATFORM_PCI config option
On 09/27/2011 10:05 AM, stefano.stabellini@eu.citrix.com wrote:> From: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > > Xen PVHVM needs xen-platform-pci, on the other hand xen-platform-pci is > useless in any other cases. > Therefore remove the XEN_PLATFORM_PCI config option and compile > xen-platform-pci built-in if XEN_PVHVM is selected. > > Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > --- > drivers/xen/Kconfig | 10 ---------- > drivers/xen/Makefile | 2 +- > 2 files changed, 1 insertions(+), 11 deletions(-) > > diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig > index 5f7ff8e..8795480 100644 > --- a/drivers/xen/Kconfig > +++ b/drivers/xen/Kconfig > @@ -137,16 +137,6 @@ config XEN_GRANT_DEV_ALLOC > to other domains. This can be used to implement frontend drivers > or as part of an inter-domain shared memory channel. > > -config XEN_PLATFORM_PCI > - tristate "xen platform pci device driver" > - depends on XEN_PVHVM && PCI > - default m > - help > - Driver for the Xen PCI Platform device: it is responsible for > - initializing xenbus and grant_table when running in a Xen HVM > - domain. As a consequence this driver is required to run any Xen PV > - frontend on Xen HVM. > - > config SWIOTLB_XEN > def_bool y > depends on PCI > diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile > index 72bbb27..d8dc26a 100644 > --- a/drivers/xen/Makefile > +++ b/drivers/xen/Makefile > @@ -14,7 +14,7 @@ obj-$(CONFIG_XEN_GNTDEV) += xen-gntdev.o > obj-$(CONFIG_XEN_GRANT_DEV_ALLOC) += xen-gntalloc.o > obj-$(CONFIG_XENFS) += xenfs/ > obj-$(CONFIG_XEN_SYS_HYPERVISOR) += sys-hypervisor.o > -obj-$(CONFIG_XEN_PLATFORM_PCI) += xen-platform-pci.o > +obj-$(CONFIG_XEN_PVHVM) += xen-platform-pci.oMay as well just say "platform-pci.o" and remove the "xen-platform-pci-y := platform-pci.o" further down, since its no longer externally visible. J _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Stefano Stabellini
2011-Sep-29 11:01 UTC
[Xen-devel] Re: [PATCH 2/2] xen: remove XEN_PLATFORM_PCI config option
On Tue, 27 Sep 2011, Jeremy Fitzhardinge wrote:> > diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile > > index 72bbb27..d8dc26a 100644 > > --- a/drivers/xen/Makefile > > +++ b/drivers/xen/Makefile > > @@ -14,7 +14,7 @@ obj-$(CONFIG_XEN_GNTDEV) += xen-gntdev.o > > obj-$(CONFIG_XEN_GRANT_DEV_ALLOC) += xen-gntalloc.o > > obj-$(CONFIG_XENFS) += xenfs/ > > obj-$(CONFIG_XEN_SYS_HYPERVISOR) += sys-hypervisor.o > > -obj-$(CONFIG_XEN_PLATFORM_PCI) += xen-platform-pci.o > > +obj-$(CONFIG_XEN_PVHVM) += xen-platform-pci.o > > May as well just say "platform-pci.o" and remove the > "xen-platform-pci-y := platform-pci.o" further down, since > its no longer externally visible. >good idea, I''ll do that _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel