diff options
| author | Thomas Huth | 2019-01-29 10:42:14 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2019-03-07 21:46:19 +0100 |
| commit | 9e5c2056d1e80f344a0c412d7a3d847db1f4e034 (patch) | |
| tree | 742083223d3e522a6fb7b5939fe8c6d35a3f8e3e /default-configs | |
| parent | riscv-softmmu.mak: replace CONFIG_* with Kconfig "select" directives (diff) | |
| download | qemu-9e5c2056d1e80f344a0c412d7a3d847db1f4e034.tar.gz qemu-9e5c2056d1e80f344a0c412d7a3d847db1f4e034.tar.xz qemu-9e5c2056d1e80f344a0c412d7a3d847db1f4e034.zip | |
s390x: express dependencies with Kconfig
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 <thuth@redhat.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'default-configs')
| -rw-r--r-- | default-configs/s390x-softmmu.mak | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak index 2be5059016..f2287a133f 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 |