Give ivshmem its own config option

Currently the ivshmem device is built whenever both PCI and KVM support are
included.  This patch gives it its own config option to allow easier
customization of whether to include it.  It's enabled by default in the
same circumstances as now - when both PCI and KVM are available.

Signed-off-by: David Gibson <[email protected]>
Reviewed-by: Peter Crosthwaite <[email protected]>
Message-Id: <1425017077[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>

diff --git a/default-configs/pci.mak b/default-configs/pci.mak
index bea6b01553837edb0eb7fc2457d57485b4b9f4b0..58a2c0ace100eae0eaa6b92be0eb1c0ff165c12a 100644 (file)
--- a/default-configs/pci.mak
+++ b/default-configs/pci.mak
@@ -35,3 +35,4 @@ CONFIG_SDHCI=y
 CONFIG_EDU=y
 CONFIG_VGA=y
 CONFIG_VGA_PCI=y
+CONFIG_IVSHMEM=$(CONFIG_KVM)

diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs
index 029a56f279f1b8397adec6fa8823aa5a3424556b..6c6e29681a622e40318cc2cf98a9e913cc051e00 100644 (file)
--- a/hw/misc/Makefile.objs
+++ b/hw/misc/Makefile.objs
@@ -19,9 +19,7 @@ common-obj-$(CONFIG_PUV3) += puv3_pm.o
 
 common-obj-$(CONFIG_MACIO) += macio/
 
-ifeq ($(CONFIG_PCI), y)
-obj-$(CONFIG_KVM) += ivshmem.o
-endif
+obj-$(CONFIG_IVSHMEM) += ivshmem.o
 
 obj-$(CONFIG_REALVIEW) += arm_sysctl.o
 obj-$(CONFIG_NSERIES) += cbus.o