[PATCH] xen: remove XEN_PLATFORM_PCI config option

[PATCH] xen: remove XEN_PLATFORM_PCI config option

[stefano.stabellini]

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

Re: [PATCH] xen: remove XEN_PLATFORM_PCI config option

[Jeremy Fitzhardinge]

On 09/23/2011 04:19 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.

What happens if you disable CONFIG_PCI?

I think XEN_PLATFORM_PCI still needs to exist, but just not user-visible.

    J

Re: [PATCH] xen: remove XEN_PLATFORM_PCI config option

[Stefano Stabellini]

On Fri, 23 Sep 2011, Jeremy Fitzhardinge wrote:
> On 09/23/2011 04:19 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.
> 
> What happens if you disable CONFIG_PCI?
> 
> I think XEN_PLATFORM_PCI still needs to exist, but just not user-visible.

What if we add CONFIG_PCI as a dependency of XEN_PVHVM?

It is not like it is going to be useful to run a PV on HVM guest without
PV drivers.

Re: [PATCH] xen: remove XEN_PLATFORM_PCI config option

[Jeremy Fitzhardinge]

On 09/27/2011 07:46 AM, Stefano Stabellini wrote:
> On Fri, 23 Sep 2011, Jeremy Fitzhardinge wrote:
>> On 09/23/2011 04:19 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.
>> What happens if you disable CONFIG_PCI?
>>
>> I think XEN_PLATFORM_PCI still needs to exist, but just not user-visible.
> What if we add CONFIG_PCI as a dependency of XEN_PVHVM?
>
> It is not like it is going to be useful to run a PV on HVM guest without
> PV drivers.

In principle you could have a domain with emulated ISA IDE and net but
with PV time, etc.  But yeah, not very useful in practice.  I think
making PVHVM depend on PCI is fine.

    J