-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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>
- Loading branch information
Showing
4 changed files
with
28 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters