This moves some devices that are mostly used for testing purposes
(for example in endianness-test) under a new symbol CONFIG_TEST_DEVICES
that has to be enabled explicitly in the default-configs file. This makes
it easier to drop this code from QEMU if desirable.
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
default-configs/alpha-softmmu.mak | 2 +-
default-configs/i386-softmmu.mak | 1 +
default-configs/mips-softmmu-common.mak | 2 +-
default-configs/ppc-softmmu.mak | 2 +-
default-configs/sh4-softmmu.mak | 3 +--
default-configs/sh4eb-softmmu.mak | 2 +-
default-configs/sparc64-softmmu.mak | 2 +-
hw/Kconfig | 3 +++
hw/hyperv/Kconfig | 2 +-
hw/misc/Kconfig | 7 ++++---
10 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/default-configs/alpha-softmmu.mak
b/default-configs/alpha-softmmu.mak
index 2ad4d40..762e3a2 100644
--- a/default-configs/alpha-softmmu.mak
+++ b/default-configs/alpha-softmmu.mak
@@ -10,6 +10,6 @@ CONFIG_VMWARE_VGA=y
CONFIG_IDE_CMD646=y
CONFIG_I8259=y
CONFIG_MC146818RTC=y
-CONFIG_ISA_TESTDEV=y
+CONFIG_TEST_DEVICES=y
CONFIG_SMC37C669=y
CONFIG_DP264=y
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 07b1e82..0f30bd6 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -3,6 +3,7 @@
# Optional devices:
#
CONFIG_PCI_DEVICES=y
+CONFIG_TEST_DEVICES=y
# Boards:
#
diff --git a/default-configs/mips-softmmu-common.mak
b/default-configs/mips-softmmu-common.mak
index e5f0841..ac70f00 100644
--- a/default-configs/mips-softmmu-common.mak
+++ b/default-configs/mips-softmmu-common.mak
@@ -31,7 +31,6 @@ CONFIG_MIPSNET=y
CONFIG_PFLASH_CFI01=y
CONFIG_I8259=y
CONFIG_MC146818RTC=y
-CONFIG_ISA_TESTDEV=y
CONFIG_EMPTY_SLOT=y
CONFIG_MIPS_CPS=y
CONFIG_MIPS_ITU=y
@@ -41,3 +40,4 @@ CONFIG_MALTA=y
CONFIG_MIPSSIM=y
CONFIG_ACPI_SMBUS=y
CONFIG_SMBUS_EEPROM=y
+CONFIG_TEST_DEVICES=y
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index 87c2d6d..05ba726 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -3,6 +3,7 @@
CONFIG_PCI=y
CONFIG_PCI_DEVICES=y
CONFIG_ISA_BUS=y
+CONFIG_TEST_DEVICES=y
# For embedded PPCs:
CONFIG_PPC4XX=y
@@ -57,7 +58,6 @@ CONFIG_MAC_NEWWORLD=y
# For PReP
CONFIG_PREP=y
CONFIG_PREP_PCI=y
-CONFIG_ISA_TESTDEV=y
CONFIG_RS6000_MC=y
CONFIG_I82374=y
CONFIG_I82378=y
diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak
index 1b4582a..4ebcaaa 100644
--- a/default-configs/sh4-softmmu.mak
+++ b/default-configs/sh4-softmmu.mak
@@ -9,9 +9,8 @@ CONFIG_IDE_MMIO=y
CONFIG_SM501=y
CONFIG_I2C=y
CONFIG_DDC=y
-CONFIG_ISA_TESTDEV=y
+CONFIG_TEST_DEVICES=y
CONFIG_I82378=y
CONFIG_I82374=y
CONFIG_R2D=y
CONFIG_SHIX=y
-CONFIG_TEST_DEVICES=y
diff --git a/default-configs/sh4eb-softmmu.mak
b/default-configs/sh4eb-softmmu.mak
index baed9a4..4ebcaaa 100644
--- a/default-configs/sh4eb-softmmu.mak
+++ b/default-configs/sh4eb-softmmu.mak
@@ -9,7 +9,7 @@ CONFIG_IDE_MMIO=y
CONFIG_SM501=y
CONFIG_I2C=y
CONFIG_DDC=y
-CONFIG_ISA_TESTDEV=y
+CONFIG_TEST_DEVICES=y
CONFIG_I82378=y
CONFIG_I82374=y
CONFIG_R2D=y
diff --git a/default-configs/sparc64-softmmu.mak
b/default-configs/sparc64-softmmu.mak
index aef26a2..7fe1005 100644
--- a/default-configs/sparc64-softmmu.mak
+++ b/default-configs/sparc64-softmmu.mak
@@ -14,7 +14,7 @@ CONFIG_PCI_SABRE=y
CONFIG_SIMBA=y
CONFIG_SUNHME=y
CONFIG_MC146818RTC=y
-CONFIG_ISA_TESTDEV=y
+CONFIG_TEST_DEVICES=y
CONFIG_SUN4V_RTC=y
CONFIG_SUN4U=y
CONFIG_NIAGARA=y
diff --git a/hw/Kconfig b/hw/Kconfig
index e3c380f..d5ecd02 100644
--- a/hw/Kconfig
+++ b/hw/Kconfig
@@ -61,6 +61,9 @@ source unicore32/Kconfig
source xtensa/Kconfig
# Symbols used by multiple targets
+config TEST_DEVICES
+ bool
+
config XILINX
bool
select PTIMER # for hw/timer/xilinx_timer.c
diff --git a/hw/hyperv/Kconfig b/hw/hyperv/Kconfig
index a178bac..892a472 100644
--- a/hw/hyperv/Kconfig
+++ b/hw/hyperv/Kconfig
@@ -5,5 +5,5 @@ config HYPERV
config HYPERV_TESTDEV
bool
- default y if PC
+ default y if TEST_DEVICES
depends on HYPERV
diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
index 823135c..3ebe30f 100644
--- a/hw/misc/Kconfig
+++ b/hw/misc/Kconfig
@@ -25,16 +25,17 @@ config SGA
config ISA_TESTDEV
bool
- default y if PC
+ default y if TEST_DEVICES
+ depends on ISA_BUS
config PCI_TESTDEV
bool
- default y if PCI_DEVICES
+ default y if TEST_DEVICES
depends on PCI
config EDU
bool
- default y if PCI_DEVICES
+ default y if TEST_DEVICES
depends on PCI
config PCA9552
--
1.8.3.1
