diff options
| author | Cody Schuffelen <schuffelen@google.com> | 2019-01-14 18:37:28 -0800 |
|---|---|---|
| committer | Alistair Strachan <astrachan@google.com> | 2019-01-15 17:27:53 -0800 |
| commit | 5ec66a6767366c06e6a0c3f093dcf1d4e5aaa471 (patch) | |
| tree | cbdd8c775682e51dd7ab5b2aef443ebf8ad07b3f | |
| parent | 06477f7ef8c103a71d2e8a251681242f1846bd19 (diff) | |
ANDROID: cuttlefish_defconfig: Enable vsock options
Bug: 121166534
Test: Ran cuttlefish with android-4.4 + vsock adb tunnel
Signed-off-by: Cody Schuffelen <schuffelen@google.com>
Change-Id: I8168a710052c7daada306a915c56230c961accd4
| -rw-r--r-- | arch/arm64/configs/cuttlefish_defconfig | 4 | ||||
| -rw-r--r-- | arch/x86/configs/x86_64_cuttlefish_defconfig | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig index 2dacb5ca76df..7457781a6f4f 100644 --- a/arch/arm64/configs/cuttlefish_defconfig +++ b/arch/arm64/configs/cuttlefish_defconfig @@ -179,6 +179,8 @@ CONFIG_NET_CLS_U32=y CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_U32=y CONFIG_NET_CLS_ACT=y +CONFIG_VSOCKETS=y +CONFIG_VIRTIO_VSOCKETS=y CONFIG_CFG80211=y # CONFIG_CFG80211_DEFAULT_PS is not set CONFIG_MAC80211=y @@ -385,6 +387,8 @@ CONFIG_SDCARD_FS=y CONFIG_PSTORE=y CONFIG_PSTORE_CONSOLE=y CONFIG_PSTORE_RAM=y +CONFIG_VIRTUALIZATION=y +CONFIG_VHOST_VSOCK=y CONFIG_PRINTK_TIME=y CONFIG_DEBUG_INFO=y # CONFIG_ENABLE_MUST_CHECK is not set diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig index 8383fea15ad7..7e83b1f6b015 100644 --- a/arch/x86/configs/x86_64_cuttlefish_defconfig +++ b/arch/x86/configs/x86_64_cuttlefish_defconfig @@ -191,6 +191,8 @@ CONFIG_NET_CLS_U32=y CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_U32=y CONFIG_NET_CLS_ACT=y +CONFIG_VSOCKETS=y +CONFIG_VIRTIO_VSOCKETS=y CONFIG_CFG80211=y CONFIG_MAC80211=y CONFIG_RFKILL=y @@ -459,3 +461,4 @@ CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y CONFIG_X509_CERTIFICATE_PARSER=y CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_SYSTEM_TRUSTED_KEYS="verity_dev_keys.x509" +CONFIG_VHOST_VSOCK=y |