Commit 687d8f4c authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge branch 'kvm-kconfig' 

Cleanups to Kconfig definitions for KVM

* replace HAVE_KVM with an architecture-dependent symbol, when CONFIG_KVM
  may or may not be available depending on CPU capabilities (MIPS)

* replace HAVE_KVM with IS_ENABLED(CONFIG_KVM) for host-side code that is
  not part of the KVM module, so that it is completely compiled out

* factor common "select" statements in common code instead of requiring
  each architecture to specify it
parents 69327047 f48212ee

arch/arm64/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ config ARM64 
	select HAVE_HW_BREAKPOINT if PERF_EVENTS

	select HAVE_IOREMAP_PROT

	select HAVE_IRQ_TIME_ACCOUNTING

	select HAVE_KVM

	select HAVE_MOD_ARCH_SPECIFIC

	select HAVE_NMI

	select HAVE_PERF_EVENTS

arch/arm64/kvm/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ if VIRTUALIZATION 


menuconfig KVM

	bool "Kernel-based Virtual Machine (KVM) support"

	depends on HAVE_KVM

	select KVM_COMMON

	select KVM_GENERIC_HARDWARE_ENABLING

	select KVM_GENERIC_MMU_NOTIFIER
@@ -34,7 +33,6 @@ menuconfig KVM 
	select HAVE_KVM_MSI

	select HAVE_KVM_IRQCHIP

	select HAVE_KVM_IRQ_ROUTING

	select IRQ_BYPASS_MANAGER

	select HAVE_KVM_IRQ_BYPASS

	select HAVE_KVM_READONLY_MEM

	select HAVE_KVM_VCPU_RUN_PID_CHANGE

arch/loongarch/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ config LOONGARCH 
	select HAVE_KPROBES

	select HAVE_KPROBES_ON_FTRACE

	select HAVE_KRETPROBES

	select HAVE_KVM

	select HAVE_MOD_ARCH_SPECIFIC

	select HAVE_NMI

	select HAVE_PCI

arch/loongarch/kvm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ if VIRTUALIZATION 
config KVM

	tristate "Kernel-based Virtual Machine (KVM) support"

	depends on AS_HAS_LVZ_EXTENSION

	depends on HAVE_KVM

	select HAVE_KVM_DIRTY_RING_ACQ_REL

	select HAVE_KVM_VCPU_ASYNC_IOCTL

	select KVM_COMMON

arch/mips/Kconfig

+9 −9
Original line number Diff line number Diff line
@@ -1250,6 +1250,7 @@ config CPU_LOONGSON64 
	select CPU_SUPPORTS_HIGHMEM

	select CPU_SUPPORTS_HUGEPAGES

	select CPU_SUPPORTS_MSA

	select CPU_SUPPORTS_VZ

	select CPU_DIEI_BROKEN if !LOONGSON3_ENHANCEMENT

	select CPU_MIPSR2_IRQ_VI

	select DMA_NONCOHERENT
@@ -1261,7 +1262,6 @@ config CPU_LOONGSON64 
	select MIPS_FP_SUPPORT

	select GPIOLIB

	select SWIOTLB

	select HAVE_KVM

	help

	  The Loongson GSx64(GS264/GS464/GS464E/GS464V) series of processor

	  cores implements the MIPS64R2 instruction set with many extensions,
@@ -1374,7 +1374,6 @@ config CPU_MIPS32_R2 
	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_HIGHMEM

	select CPU_SUPPORTS_MSA

	select HAVE_KVM

	help

	  Choose this option to build a kernel for release 2 or later of the

	  MIPS32 architecture.  Most modern embedded systems with a 32-bit
@@ -1389,7 +1388,7 @@ config CPU_MIPS32_R5 
	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_HIGHMEM

	select CPU_SUPPORTS_MSA

	select HAVE_KVM

	select CPU_SUPPORTS_VZ

	select MIPS_O32_FP64_SUPPORT

	help

	  Choose this option to build a kernel for release 5 or later of the
@@ -1405,7 +1404,7 @@ config CPU_MIPS32_R6 
	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_HIGHMEM

	select CPU_SUPPORTS_MSA

	select HAVE_KVM

	select CPU_SUPPORTS_VZ

	select MIPS_O32_FP64_SUPPORT

	help

	  Choose this option to build a kernel for release 6 or later of the
@@ -1441,7 +1440,6 @@ config CPU_MIPS64_R2 
	select CPU_SUPPORTS_HIGHMEM

	select CPU_SUPPORTS_HUGEPAGES

	select CPU_SUPPORTS_MSA

	select HAVE_KVM

	help

	  Choose this option to build a kernel for release 2 or later of the

	  MIPS64 architecture.  Many modern embedded systems with a 64-bit
@@ -1459,7 +1457,7 @@ config CPU_MIPS64_R5 
	select CPU_SUPPORTS_HUGEPAGES

	select CPU_SUPPORTS_MSA

	select MIPS_O32_FP64_SUPPORT if 32BIT || MIPS32_O32

	select HAVE_KVM

	select CPU_SUPPORTS_VZ

	help

	  Choose this option to build a kernel for release 5 or later of the

	  MIPS64 architecture.  This is a intermediate MIPS architecture
@@ -1477,7 +1475,7 @@ config CPU_MIPS64_R6 
	select CPU_SUPPORTS_HUGEPAGES

	select CPU_SUPPORTS_MSA

	select MIPS_O32_FP64_SUPPORT if 32BIT || MIPS32_O32

	select HAVE_KVM

	select CPU_SUPPORTS_VZ

	help

	  Choose this option to build a kernel for release 6 or later of the

	  MIPS64 architecture.  New MIPS processors, starting with the Warrior
@@ -1492,9 +1490,9 @@ config CPU_P5600 
	select CPU_SUPPORTS_HIGHMEM

	select CPU_SUPPORTS_MSA

	select CPU_SUPPORTS_CPUFREQ

	select CPU_SUPPORTS_VZ

	select CPU_MIPSR2_IRQ_VI

	select CPU_MIPSR2_IRQ_EI

	select HAVE_KVM

	select MIPS_O32_FP64_SUPPORT

	help

	  Choose this option to build a kernel for MIPS Warrior P5600 CPU.
@@ -1614,7 +1612,7 @@ config CPU_CAVIUM_OCTEON 
	select USB_EHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN

	select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN

	select MIPS_L1_CACHE_SHIFT_7

	select HAVE_KVM

	select CPU_SUPPORTS_VZ

	help

	  The Cavium Octeon processor is a highly integrated chip containing

	  many ethernet hardware widgets for networking tasks. The processor
@@ -1969,6 +1967,8 @@ config CPU_SUPPORTS_ADDRWINCFG 
config CPU_SUPPORTS_HUGEPAGES

	bool

	depends on !(32BIT && (PHYS_ADDR_T_64BIT || EVA))

config CPU_SUPPORTS_VZ

	bool

config MIPS_PGD_C0_CONTEXT

	bool

	depends on 64BIT