kvmarm.lists.cs.columbia.edu archive mirror
 help / color / mirror / Atom feed
From: Fuad Tabba <tabba@google.com>
To: maz@kernel.org, catalin.marinas@arm.com,
	julien.thierry.kdev@gmail.com,  suzuki.poulose@arm.com,
	kvmarm@lists.cs.columbia.edu
Cc: will@kernel.org
Subject: [PATCH v4 3/4] KVM: arm64: Change CONFIG_KVM to a menuconfig entry
Date: Tue, 21 Apr 2020 14:17:33 +0100	[thread overview]
Message-ID: <20200421131734.141766-4-tabba@google.com> (raw)
In-Reply-To: <20200421131734.141766-1-tabba@google.com>

From: Will Deacon <will@kernel.org>

Changing CONFIG_KVM to be a 'menuconfig' entry in Kconfig mean that we
can straightforwardly enumerate optional features, such as the virtual
PMU device as dependent options.

Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Fuad Tabba <tabba@google.com>
---
 arch/arm64/kvm/Kconfig | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig
index d2cf4f099454..f1c1f981482c 100644
--- a/arch/arm64/kvm/Kconfig
+++ b/arch/arm64/kvm/Kconfig
@@ -3,7 +3,6 @@
 # KVM configuration
 #
 
-source "virt/kvm/Kconfig"
 source "virt/lib/Kconfig"
 
 menuconfig VIRTUALIZATION
@@ -18,7 +17,7 @@ menuconfig VIRTUALIZATION
 
 if VIRTUALIZATION
 
-config KVM
+menuconfig KVM
 	bool "Kernel-based Virtual Machine (KVM) support"
 	depends on OF
 	# for TASKSTATS/TASK_DELAY_ACCT:
@@ -33,7 +32,6 @@ config KVM
 	select KVM_VFIO
 	select HAVE_KVM_EVENTFD
 	select HAVE_KVM_IRQFD
-	select KVM_ARM_PMU if HW_PERF_EVENTS
 	select HAVE_KVM_MSI
 	select HAVE_KVM_IRQCHIP
 	select HAVE_KVM_IRQ_ROUTING
@@ -47,13 +45,21 @@ config KVM
 
 	  If unsure, say N.
 
+if KVM
+
+source "virt/kvm/Kconfig"
+
 config KVM_ARM_PMU
-	bool
+	bool "Virtual Performance Monitoring Unit (PMU) support"
+	depends on HW_PERF_EVENTS
+	default y
 	---help---
 	  Adds support for a virtual Performance Monitoring Unit (PMU) in
 	  virtual machines.
 
 config KVM_INDIRECT_VECTORS
-       def_bool KVM && (HARDEN_BRANCH_PREDICTOR || HARDEN_EL2_VECTORS)
+	def_bool HARDEN_BRANCH_PREDICTOR || HARDEN_EL2_VECTORS
+
+endif # KVM
 
 endif # VIRTUALIZATION
-- 
2.26.1.301.g55bc3eb7cb9-goog

_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

  parent reply	other threads:[~2020-04-21 13:17 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-21 13:17 [PATCH v4 0/4] KVM: arm64: Tidy up arch Kconfig and Makefiles Fuad Tabba
2020-04-21 13:17 ` [PATCH v4 1/4] KVM: arm64: Kill off CONFIG_KVM_ARM_HOST Fuad Tabba
2020-05-01  9:16   ` Suzuki K Poulose
2020-04-21 13:17 ` [PATCH v4 2/4] KVM: arm64: Update help text Fuad Tabba
2020-05-01  8:56   ` Suzuki K Poulose
2020-04-21 13:17 ` Fuad Tabba [this message]
2020-05-01  9:18   ` [PATCH v4 3/4] KVM: arm64: Change CONFIG_KVM to a menuconfig entry Suzuki K Poulose
2020-04-21 13:17 ` [PATCH v4 4/4] KVM: arm64: Clean up kvm makefiles Fuad Tabba
2020-04-30 20:25   ` Will Deacon
2020-05-04 13:26   ` Quentin Perret
2020-05-04 15:27     ` Marc Zyngier
2020-05-04 15:29       ` Fuad Tabba

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200421131734.141766-4-tabba@google.com \
    --to=tabba@google.com \
    --cc=catalin.marinas@arm.com \
    --cc=julien.thierry.kdev@gmail.com \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=maz@kernel.org \
    --cc=suzuki.poulose@arm.com \
    --cc=will@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).