Commit 24189101 authored Jan 16, 2019 by Cody Schuffelen Committed by Alistair Strachan Jan 18, 2019

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>

parent 3fcfb1ac

arch/arm64/configs/cuttlefish_defconfig

+0 −2

Original line number	Diff line number	Diff line
		@@ -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

arch/x86/configs/x86_64_cuttlefish_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -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