diff options
| author | Cody Schuffelen <schuffelen@google.com> | 2019-01-16 16:45:29 -0800 |
|---|---|---|
| committer | Alistair Strachan <astrachan@google.com> | 2019-01-18 17:33:19 -0800 |
| commit | 24189101975d0efe8d75557f47f1406faa4dffaa (patch) | |
| tree | eabbfaf6413b69cec91842fa1d0f1c44490a923f | |
| parent | 3fcfb1ac66997546f25f41ce40da0ff158e59b2d (diff) | |
ANDROID: Fix cuttlefish redundant vsock connection.
I initially believed CONFIG_VHOST_VSOCK was necessary on the guest side,
but astrachan@ correctly pointed out that this was for setting up vsock
on a host system.
With both CONFIG_VHOST_VSOCK and the other vsock options enabled, vsock
fails on startup with the error:
vmw_vsock_virtio_transport: probe of virtio9 failed with error -16
This is probably from the guest-side and host-side vsock fighting over
ownership on the vsock device.
Bug: 121166534
Test: Ran cuttlefish with the android-4.4 kernel.
Change-Id: Ib23a5d756f02708984babc73e26fdbef8435bfb4
Signed-off-by: Cody Schuffelen <schuffelen@google.com>
| -rw-r--r-- | arch/arm64/configs/cuttlefish_defconfig | 2 | ||||
| -rw-r--r-- | arch/x86/configs/x86_64_cuttlefish_defconfig | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig index 7457781a6f4f..ad998649d71f 100644 --- a/arch/arm64/configs/cuttlefish_defconfig +++ b/arch/arm64/configs/cuttlefish_defconfig @@ -387,8 +387,6 @@ 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 7e83b1f6b015..fc2d30e1361d 100644 --- a/arch/x86/configs/x86_64_cuttlefish_defconfig +++ b/arch/x86/configs/x86_64_cuttlefish_defconfig @@ -461,4 +461,3 @@ 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 |