From 9bb9de3b9f763f7da10400978a70afcbfea1c8c9 Mon Sep 17 00:00:00 2001 From: Ram Muthiah Date: Thu, 30 Jan 2020 21:19:04 -0800 Subject: [PATCH] ANDROID: Remove default y for VIRTIO_PCI_LEGACY Bug: 139431025 Test: Treehugger Change-Id: I6943cf6b1fedc2b82332c1dcf9a91281a3ca5627 Signed-off-by: Ram Muthiah --- arch/arm64/configs/gki_defconfig | 1 - arch/x86/configs/gki_defconfig | 1 - drivers/virtio/Kconfig | 6 ------ 3 files changed, 8 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index de8e92b829fb..fd2cf04efb41 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -365,7 +365,6 @@ CONFIG_RTC_DRV_PL031=y CONFIG_DMADEVICES=y CONFIG_UIO=y CONFIG_VIRTIO_PCI=m -# CONFIG_VIRTIO_PCI_LEGACY is not set CONFIG_VIRTIO_PMEM=m CONFIG_VIRTIO_INPUT=m CONFIG_VIRTIO_MMIO=m diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 057af751aa7d..3311fa35a041 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -319,7 +319,6 @@ CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_TEST=m CONFIG_UIO=y CONFIG_VIRTIO_PCI=m -# CONFIG_VIRTIO_PCI_LEGACY is not set CONFIG_VIRTIO_PMEM=m CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_INPUT=m diff --git a/drivers/virtio/Kconfig b/drivers/virtio/Kconfig index 009278b23241..a936c5555c79 100644 --- a/drivers/virtio/Kconfig +++ b/drivers/virtio/Kconfig @@ -25,7 +25,6 @@ config VIRTIO_PCI config VIRTIO_PCI_LEGACY bool "Support for legacy virtio draft 0.9.X and older devices" - default y depends on VIRTIO_PCI ---help--- Virtio PCI Card 0.9.X Draft (circa 2014) and older device support. @@ -35,11 +34,6 @@ config VIRTIO_PCI_LEGACY If disabled, you get a slightly smaller, non-transitional driver, with no legacy compatibility. - So look out into your driveway. Do you have a flying car? If - so, you can happily disable this option and virtio will not - break. Otherwise, leave it set. Unless you're testing what - life will be like in The Future. - If unsure, say Y. config VIRTIO_PMEM