commit f7e7021b9ead9b91bcb35612916543bd53f97583
author Fuad Tabba <tabba@google.com> Tue Sep 12 13:56:02 2023 +0100
committer Fuad Tabba <tabba@google.com> Tue Nov 07 10:56:12 2023 +0000
tree 2bafdb0ae7e6e1665da03c3487131a32b63a5620
parent ee94699a1a0fe44251061b655ae6247a4700a8bb

Revert "ANDROID: GKI: move virtual device related cfgs out"

This reverts commit 64302bc801132ef90fff0073f5fb586a9b77c2a2.

arch/arm64/configs/gki_defconfig

diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 20a597b..8517570 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -259,6 +259,7 @@
 CONFIG_NET_ACT_MIRRED=y
 CONFIG_NET_ACT_SKBEDIT=y
 CONFIG_NET_ACT_BPF=y
+CONFIG_VSOCKETS=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CAN=m
 CONFIG_BT=m
@@ -534,6 +535,7 @@
 CONFIG_RTC_DRV_PL031=y
 CONFIG_DMABUF_HEAPS=y
 CONFIG_UIO=y
+CONFIG_VHOST_VSOCK=y
 CONFIG_STAGING=y
 CONFIG_ASHMEM=y
 CONFIG_COMMON_CLK_SCPI=y
@@ -577,6 +579,7 @@
 CONFIG_QUOTA=y
 CONFIG_QFMT_V2=y
 CONFIG_FUSE_FS=y
+CONFIG_VIRTIO_FS=y
 CONFIG_OVERLAY_FS=y
 CONFIG_INCREMENTAL_FS=y
 CONFIG_MSDOS_FS=y

arch/riscv/configs/gki_defconfig

diff --git a/arch/riscv/configs/gki_defconfig b/arch/riscv/configs/gki_defconfig
index 025a4db..9b85b8a 100644
--- a/arch/riscv/configs/gki_defconfig
+++ b/arch/riscv/configs/gki_defconfig
@@ -239,6 +239,7 @@
 CONFIG_NET_ACT_MIRRED=y
 CONFIG_NET_ACT_SKBEDIT=y
 CONFIG_NET_ACT_BPF=y
+CONFIG_VSOCKETS=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CAN=m
 CONFIG_BT=m
@@ -487,6 +488,7 @@
 CONFIG_RTC_CLASS=y
 CONFIG_DMABUF_HEAPS=y
 CONFIG_UIO=y
+CONFIG_VHOST_VSOCK=y
 CONFIG_STAGING=y
 CONFIG_ASHMEM=y
 # CONFIG_SUNXI_CCU is not set
@@ -527,6 +529,7 @@
 CONFIG_QUOTA=y
 CONFIG_QFMT_V2=y
 CONFIG_FUSE_FS=y
+CONFIG_VIRTIO_FS=y
 CONFIG_OVERLAY_FS=y
 CONFIG_INCREMENTAL_FS=y
 CONFIG_MSDOS_FS=y

arch/x86/configs/gki_defconfig

diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index ed0a2b0..3acf33f 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -255,6 +255,7 @@
 CONFIG_NET_ACT_MIRRED=y
 CONFIG_NET_ACT_SKBEDIT=y
 CONFIG_NET_ACT_BPF=y
+CONFIG_VSOCKETS=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CAN=m
 CONFIG_BT=m
@@ -498,6 +499,7 @@
 # CONFIG_RTC_HCTOSYS is not set
 CONFIG_DMABUF_HEAPS=y
 CONFIG_UIO=y
+CONFIG_VHOST_VSOCK=y
 CONFIG_STAGING=y
 CONFIG_ASHMEM=y
 CONFIG_REMOTEPROC=y
@@ -528,6 +530,7 @@
 CONFIG_QUOTA=y
 CONFIG_QFMT_V2=y
 CONFIG_FUSE_FS=y
+CONFIG_VIRTIO_FS=y
 CONFIG_OVERLAY_FS=y
 CONFIG_INCREMENTAL_FS=y
 CONFIG_MSDOS_FS=y