[gentoo-commits] proj/genkernel:master commit in: defaults/, /

["Thomas Deutschmann" <whissi@gentoo.org>]

commit:     c016fa911d55334398fc83cf8ca4178c8d77484a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 20 01:58:00 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:59:16 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c016fa91

kernel-generic-config: Disable Virtio by default, use --virtio

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/kernel-generic-config | 21 ++-------------------
 gen_configkernel.sh            |  3 +++
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index c76b175..3e5d589 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -470,23 +470,8 @@ CONFIG_BLK_DEV_VIA82CXXX=y
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_BLK_DEV_HD is not set
 
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_BLK=m
-CONFIG_VIRTIO_BLK_SCSI=m
-CONFIG_VIRTIO_RING=m
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_NET=m
-CONFIG_VMXNET3=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_VIRTIO_MMIO=m
-CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_BLK_MQ_VIRTIO=y
-CONFIG_CRYPTO_DEV_VIRTIO=m
-CONFIG_DRM_VIRTIO_GPU=m
-
+# CONFIG_VIRT_DRIVERS is not set
+# CONFIG_VIRTIO_MENU is not set
 
 #
 # SCSI device support
@@ -946,7 +931,6 @@ CONFIG_RDS_TCP=m
 
 CONFIG_NET_9P=m
 CONFIG_NET_9P_FD=m
-CONFIG_NET_9P_VIRTIO=m
 # CONFIG_NET_9P_DEBUG is not set
 CONFIG_NET_9P_RDMA=m
 
@@ -4529,7 +4513,6 @@ CONFIG_IXGBEVF=m
 CONFIG_IXGBE_HWMON=y
 CONFIG_IXGBE_PTP=y
 CONFIG_VMWARE_PVSCSI=m
-CONFIG_SCSI_VIRTIO=m
 CONFIG_SCSI_PM8001=m
 CONFIG_MACVTAP=m
 CONFIG_SND_HDA_PREALLOC_SIZE=512

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index d95368f..6141ba6 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -749,6 +749,9 @@ config_kernel() {
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_MMIO" "${newvirtio_setting}"
 		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES" "y"
 
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_NET_9P" "${newvirtio_setting}"
+		kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_NET_9P_VIRTIO" "${newvirtio_setting}"
+
 		if [ ${KV_NUMERIC} -ge 4008 ]
 		then
 			local cfg_CONFIG_VSOCKETS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_VSOCKETS")