[configs] Enable VIRTIO_VSOCKETS
Also SMP is default-enabled on ARM64, so we do not have to explicitly
specify it.
PD-115
Change-Id: I8aa50d510d8ce3e1c000ed4e9433ea0699861dd2
diff --git a/arch/arm64/configs/machina_defconfig b/arch/arm64/configs/machina_defconfig
index 248c18e..d43ddfe 100644
--- a/arch/arm64/configs/machina_defconfig
+++ b/arch/arm64/configs/machina_defconfig
@@ -6,6 +6,8 @@
CONFIG_PARAVIRT=y
CONFIG_NET=y
CONFIG_UNIX=y
+CONFIG_VSOCKETS=y
+CONFIG_VIRTIO_VSOCKETS=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_VIRTIO_BLK=y
@@ -22,4 +24,3 @@
CONFIG_EXT2_FS=y
CONFIG_EXT4_FS=y
CONFIG_TMPFS=y
-CONFIG_SMP=y
diff --git a/arch/x86/configs/machina_defconfig b/arch/x86/configs/machina_defconfig
index 9808eba..fb7e7a4 100644
--- a/arch/x86/configs/machina_defconfig
+++ b/arch/x86/configs/machina_defconfig
@@ -1,8 +1,14 @@
CONFIG_CGROUPS=y
CONFIG_BLK_DEV_INITRD=y
+CONFIG_SMP=y
+CONFIG_X86_X2APIC=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
CONFIG_KEXEC=y
CONFIG_NET=y
CONFIG_UNIX=y
+CONFIG_VSOCKETS=y
+CONFIG_VIRTIO_VSOCKETS=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_VIRTIO_BLK=y
@@ -21,8 +27,3 @@
CONFIG_EXT2_FS=y
CONFIG_EXT4_FS=y
CONFIG_TMPFS=y
-CONFIG_X86_X2APIC=y
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_PARAVIRT=y
-CONFIG_KVM_GUEST=y
-CONFIG_SMP=y
