2009-04-23 07:51:15

by Chris Wright

[permalink] [raw]
Subject: [patch 083/100] KVM: Add CONFIG_HAVE_KVM_IRQCHIP

-stable review patch. If anyone has any objections, please let us know.
---------------------

From: Avi Kivity <[email protected]>

upstream commit: 5d9b8e30f543a9f21a968a4cda71e8f6d1c66a61

Two KVM archs support irqchips and two don't. Add a Kconfig item to
make selecting between the two models easier.

Signed-off-by: Avi Kivity <[email protected]>
Signed-off-by: Chris Wright <[email protected]>
---
arch/ia64/kvm/Kconfig | 4 ++++
arch/powerpc/kvm/Kconfig | 3 +++
arch/s390/kvm/Kconfig | 3 +++
arch/x86/kvm/Kconfig | 4 ++++
4 files changed, 14 insertions(+)

--- a/arch/ia64/kvm/Kconfig
+++ b/arch/ia64/kvm/Kconfig
@@ -4,6 +4,10 @@
config HAVE_KVM
bool

+config HAVE_KVM_IRQCHIP
+ bool
+ default y
+
menuconfig VIRTUALIZATION
bool "Virtualization"
depends on HAVE_KVM || IA64
--- a/arch/powerpc/kvm/Kconfig
+++ b/arch/powerpc/kvm/Kconfig
@@ -2,6 +2,9 @@
# KVM configuration
#

+config HAVE_KVM_IRQCHIP
+ bool
+
menuconfig VIRTUALIZATION
bool "Virtualization"
---help---
--- a/arch/s390/kvm/Kconfig
+++ b/arch/s390/kvm/Kconfig
@@ -4,6 +4,9 @@
config HAVE_KVM
bool

+config HAVE_KVM_IRQCHIP
+ bool
+
menuconfig VIRTUALIZATION
bool "Virtualization"
default y
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
@@ -4,6 +4,10 @@
config HAVE_KVM
bool

+config HAVE_KVM_IRQCHIP
+ bool
+ default y
+
menuconfig VIRTUALIZATION
bool "Virtualization"
depends on HAVE_KVM || X86