Commit b42075bb authored by Yang Zhong's avatar Yang Zhong Committed by Paolo Bonzini
Browse files

virtio: express virtio dependencies with Kconfig 



Signed-off-by: default avatarYang Zhong <yang.zhong@intel.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Message-Id: <20190123065618.3520-42-yang.zhong@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 2ac041c2

default-configs/i386-softmmu.mak

+0 −1
Original line number Diff line number Diff line 
# Default configuration for i386-softmmu



CONFIG_VMXNET3_PCI=y

CONFIG_VIRTIO_VGA=y

CONFIG_IPMI=y

CONFIG_IPMI_LOCAL=y

CONFIG_IPMI_EXTERN=y

default-configs/s390x-softmmu.mak

+0 −1
Original line number Diff line number Diff line 
CONFIG_PCI=y

CONFIG_VIRTIO_PCI=y

include virtio.mak

CONFIG_SCLPCONSOLE=y

CONFIG_TERMINAL3270=y

CONFIG_S390_FLIC=y

default-configs/virtio.mak

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
CONFIG_VIRTIO=y

CONFIG_VIRTIO_9P=$(CONFIG_VIRTFS)

CONFIG_VIRTIO_BALLOON=y

CONFIG_VIRTIO_BLK=y

CONFIG_VIRTIO_CRYPTO=y

CONFIG_VIRTIO_GPU=y

CONFIG_VIRTIO_INPUT=y

CONFIG_VIRTIO_NET=y

CONFIG_VIRTIO_RNG=y

CONFIG_VIRTIO_SCSI=y

CONFIG_VIRTIO_SERIAL=y

hw/9pfs/Kconfig

+1 −1
Original line number Diff line number Diff line 
config VIRTIO_9P

    bool

    default y

    depends on VIRTFS
 
    depends on VIRTFS && VIRTIO

hw/block/Kconfig

+5 −2
Original line number Diff line number Diff line
@@ -28,8 +28,11 @@ config NVME_PCI 


config VIRTIO_BLK

    bool

    default y

    depends on VIRTIO



config VHOST_USER_BLK

    bool

    default y

    depends on VHOST_USER && LINUX
 
    # Only PCI devices are provided for now

    default y if VIRTIO_PCI

    depends on VIRTIO && VHOST_USER && LINUX