[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 44/51] s390x: express dependencies with Kconfig
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 44/51] s390x: express dependencies with Kconfig |
Date: |
Thu, 7 Feb 2019 18:57:27 +0100 |
From: Thomas Huth <address@hidden>
Instead of hard-coding all config switches in the config file
default-configs/s390x-softmmu.mak, let's use the new Kconfig files
to express the necessary dependencies: The S390_CCW_VIRTIO config switch
for the "s390-ccw-virtio" machine now selects all non-optional devices.
And since we already have the VIRTIO_PCI and VIRTIO_MMIO config switches
for the other two virtio transports, this patch also introduces a new
config switch VIRTIO_CCW for the third, s390x-specific virtio transport,
so that all three virtio transports are now handled in the same way.
Signed-off-by: Thomas Huth <address@hidden>
Acked-by: Cornelia Huck <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
default-configs/s390x-softmmu.mak | 20 ++++++++++++--------
hw/s390x/Kconfig | 9 +++++++++
hw/s390x/Makefile.objs | 4 +++-
hw/virtio/Kconfig | 4 ++++
4 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/default-configs/s390x-softmmu.mak
b/default-configs/s390x-softmmu.mak
index 2be5059..f2287a1 100644
--- a/default-configs/s390x-softmmu.mak
+++ b/default-configs/s390x-softmmu.mak
@@ -1,9 +1,13 @@
-CONFIG_PCI=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_SCLPCONSOLE=y
-CONFIG_TERMINAL3270=y
-CONFIG_S390_FLIC=y
-CONFIG_WDT_DIAG288=y
+# Default configuration for s390x-softmmu
+
+# Uncomment the following lines to disable these optional devices:
+#
+#CONFIG_TERMINAL3270=n
+#CONFIG_VFIO_AP=n
+#CONFIG_VFIO_CCW=n
+#CONFIG_VIRTIO_PCI=n
+#CONFIG_WDT_DIAG288=n
+
+# Boards:
+#
CONFIG_S390_CCW_VIRTIO=y
-CONFIG_VFIO_CCW=y
-CONFIG_VFIO_AP=y
diff --git a/hw/s390x/Kconfig b/hw/s390x/Kconfig
index 303db7f..a7046ea 100644
--- a/hw/s390x/Kconfig
+++ b/hw/s390x/Kconfig
@@ -1,2 +1,11 @@
config S390_CCW_VIRTIO
bool
+ imply VIRTIO_PCI
+ imply TERMINAL3270
+ imply VFIO_AP
+ imply VFIO_CCW
+ imply WDT_DIAG288
+ select PCI
+ select S390_FLIC
+ select SCLPCONSOLE
+ select VIRTIO_CCW
diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs
index a18c471..9884979 100644
--- a/hw/s390x/Makefile.objs
+++ b/hw/s390x/Makefile.objs
@@ -6,7 +6,8 @@ obj-y += sclpcpu.o
obj-y += ipl.o
obj-y += css.o
obj-$(CONFIG_S390_CCW_VIRTIO) += s390-virtio-ccw.o
-obj-y += 3270-ccw.o
+obj-$(CONFIG_TERMINAL3270) += 3270-ccw.o
+ifeq ($(CONFIG_VIRTIO_CCW),y)
obj-y += virtio-ccw.o
obj-$(CONFIG_VIRTIO_SERIAL) += virtio-ccw-serial.o
obj-$(CONFIG_VIRTIO_BALLOON) += virtio-ccw-balloon.o
@@ -19,6 +20,7 @@ obj-$(CONFIG_VIRTIO_NET) += virtio-ccw-net.o
obj-$(CONFIG_VIRTIO_BLK) += virtio-ccw-blk.o
obj-$(call land,$(CONFIG_VIRTIO_9P),$(CONFIG_VIRTFS)) += virtio-ccw-9p.o
obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock-ccw.o
+endif
obj-y += css-bridge.o
obj-y += ccw-device.o
obj-$(CONFIG_PCI) += s390-pci-bus.o s390-pci-inst.o
diff --git a/hw/virtio/Kconfig b/hw/virtio/Kconfig
index 74f4573..e0452de 100644
--- a/hw/virtio/Kconfig
+++ b/hw/virtio/Kconfig
@@ -16,6 +16,10 @@ config VIRTIO_MMIO
bool
select VIRTIO
+config VIRTIO_CCW
+ bool
+ select VIRTIO
+
config VIRTIO_BALLOON
bool
default y
--
1.8.3.1
- [Qemu-devel] [PATCH 34/51] ppc: Express dependencies of the embedded machines with kconfig, (continued)
- [Qemu-devel] [PATCH 34/51] ppc: Express dependencies of the embedded machines with kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 35/51] alpha-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 39/51] m68k-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 38/51] lm32-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 43/51] or1k-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 36/51] cris-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 37/51] hppa-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 45/51] sh4-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 47/51] sparc64-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 44/51] s390x: express dependencies with Kconfig,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 41/51] moxie-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 40/51] microblaze-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 49/51] xtensa-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 51/51] FIXME vhost: add more stubs, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 42/51] nios2-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 48/51] unicore32-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 50/51] .travis.yml: test that no-default-device builds do not regress, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 46/51] sparc-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/02/07