aboutsummaryrefslogtreecommitdiffstats
path: root/dashboard/config/linux/android-5.4.config
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2020-11-27 09:46:08 +0100
committerDmitry Vyukov <dvyukov@google.com>2020-11-27 12:18:06 +0100
commit486f93ef445f733b35d844f33ba9edeb8423f5fa (patch)
tree9d3baa8d915678f54c73a4cc19c01239af54742e /dashboard/config/linux/android-5.4.config
parent5018c94665bf383298ac7085fb34eda9cb9b1427 (diff)
dashboard/config/linux: enable kvm_guest for android
Android stopped booting on GCE after the config update: https://syzkaller.appspot.com/bug?id=14d0e93b7c644132089efdc7e3c8ac595b18d448 (can't find root device). Let's try to enable kvm_guest for android.
Diffstat (limited to 'dashboard/config/linux/android-5.4.config')
-rw-r--r--dashboard/config/linux/android-5.4.config32
1 files changed, 21 insertions, 11 deletions
diff --git a/dashboard/config/linux/android-5.4.config b/dashboard/config/linux/android-5.4.config
index 9db5c79a5..283190556 100644
--- a/dashboard/config/linux/android-5.4.config
+++ b/dashboard/config/linux/android-5.4.config
@@ -923,7 +923,10 @@ CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_IP_MULTIPLE_TABLES=y
# CONFIG_IP_ROUTE_MULTIPATH is not set
# CONFIG_IP_ROUTE_VERBOSE is not set
-# CONFIG_IP_PNP is not set
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
CONFIG_NET_IPIP=y
CONFIG_NET_IPGRE_DEMUX=y
CONFIG_NET_IP_TUNNEL=y
@@ -1407,7 +1410,9 @@ CONFIG_RFKILL=y
CONFIG_RFKILL_LEDS=y
# CONFIG_RFKILL_INPUT is not set
# CONFIG_RFKILL_GPIO is not set
-# CONFIG_NET_9P is not set
+CONFIG_NET_9P=y
+CONFIG_NET_9P_VIRTIO=y
+# CONFIG_NET_9P_DEBUG is not set
# CONFIG_CAIF is not set
# CONFIG_CEPH_LIB is not set
CONFIG_NFC=y
@@ -1427,7 +1432,7 @@ CONFIG_NFC=y
# CONFIG_LWTUNNEL is not set
CONFIG_DST_CACHE=y
CONFIG_GRO_CELLS=y
-# CONFIG_FAILOVER is not set
+CONFIG_FAILOVER=y
CONFIG_HAVE_EBPF_JIT=y
#
@@ -1592,7 +1597,8 @@ CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=8192
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
-# CONFIG_VIRTIO_BLK is not set
+CONFIG_VIRTIO_BLK=y
+# CONFIG_VIRTIO_BLK_SCSI is not set
# CONFIG_BLK_DEV_RBD is not set
# CONFIG_BLK_DEV_RSXX is not set
@@ -1803,7 +1809,7 @@ CONFIG_SCSI_UFS_CRYPTO=y
# CONFIG_SCSI_DEBUG is not set
# CONFIG_SCSI_PMCRAID is not set
# CONFIG_SCSI_PM8001 is not set
-# CONFIG_SCSI_VIRTIO is not set
+CONFIG_SCSI_VIRTIO=y
# CONFIG_SCSI_DH is not set
# end of SCSI device support
@@ -1872,7 +1878,7 @@ CONFIG_DUMMY=y
CONFIG_TUN=y
# CONFIG_TUN_VNET_CROSS_LE is not set
CONFIG_VETH=y
-# CONFIG_VIRTIO_NET is not set
+CONFIG_VIRTIO_NET=y
# CONFIG_NLMON is not set
# CONFIG_VSOCKMON is not set
# CONFIG_ARCNET is not set
@@ -2154,7 +2160,7 @@ CONFIG_WLAN_VENDOR_ZYDAS=y
# CONFIG_VMXNET3 is not set
# CONFIG_FUJITSU_ES is not set
# CONFIG_NETDEVSIM is not set
-# CONFIG_NET_FAILOVER is not set
+CONFIG_NET_FAILOVER=y
# CONFIG_ISDN is not set
# CONFIG_NVM is not set
@@ -2462,7 +2468,7 @@ CONFIG_SERIAL_DEV_BUS=y
CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
# CONFIG_TTY_PRINTK is not set
CONFIG_HVC_DRIVER=y
-# CONFIG_VIRTIO_CONSOLE is not set
+CONFIG_VIRTIO_CONSOLE=y
# CONFIG_IPMI_HANDLER is not set
CONFIG_HW_RANDOM=y
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
@@ -3808,7 +3814,7 @@ CONFIG_DRM_KMS_CMA_HELPER=y
# CONFIG_DRM_RCAR_LVDS is not set
# CONFIG_DRM_QXL is not set
# CONFIG_DRM_BOCHS is not set
-# CONFIG_DRM_VIRTIO_GPU is not set
+CONFIG_DRM_VIRTIO_GPU=y
CONFIG_DRM_PANEL=y
#
@@ -5018,10 +5024,11 @@ CONFIG_IRQ_BYPASS_MANAGER=y
# CONFIG_VIRT_DRIVERS is not set
CONFIG_VIRTIO=y
CONFIG_VIRTIO_MENU=y
-# CONFIG_VIRTIO_PCI is not set
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_PCI_LEGACY=y
# CONFIG_VIRTIO_PMEM is not set
# CONFIG_VIRTIO_BALLOON is not set
-# CONFIG_VIRTIO_INPUT is not set
+CONFIG_VIRTIO_INPUT=y
# CONFIG_VIRTIO_MMIO is not set
#
@@ -6019,6 +6026,9 @@ CONFIG_NETWORK_FILESYSTEMS=y
# CONFIG_CIFS is not set
# CONFIG_CODA_FS is not set
# CONFIG_AFS_FS is not set
+CONFIG_9P_FS=y
+# CONFIG_9P_FS_POSIX_ACL is not set
+# CONFIG_9P_FS_SECURITY is not set
CONFIG_NLS=y
CONFIG_NLS_DEFAULT="iso8859-1"
CONFIG_NLS_CODEPAGE_437=y