diff options
| -rw-r--r-- | arch/ia64/kvm/Kconfig | 7 | ||||
| -rw-r--r-- | arch/powerpc/kvm/Kconfig | 3 | ||||
| -rw-r--r-- | arch/s390/kvm/Kconfig | 6 | ||||
| -rw-r--r-- | arch/x86/kvm/Kconfig | 7 | ||||
| -rw-r--r-- | virt/kvm/Kconfig | 7 |
5 files changed, 13 insertions, 17 deletions
diff --git a/arch/ia64/kvm/Kconfig b/arch/ia64/kvm/Kconfig index 64d520937874..f922bbba3797 100644 --- a/arch/ia64/kvm/Kconfig +++ b/arch/ia64/kvm/Kconfig | |||
| @@ -1,12 +1,8 @@ | |||
| 1 | # | 1 | # |
| 2 | # KVM configuration | 2 | # KVM configuration |
| 3 | # | 3 | # |
| 4 | config HAVE_KVM | ||
| 5 | bool | ||
| 6 | 4 | ||
| 7 | config HAVE_KVM_IRQCHIP | 5 | source "virt/kvm/Kconfig" |
| 8 | bool | ||
| 9 | default y | ||
| 10 | 6 | ||
| 11 | menuconfig VIRTUALIZATION | 7 | menuconfig VIRTUALIZATION |
| 12 | bool "Virtualization" | 8 | bool "Virtualization" |
| @@ -28,6 +24,7 @@ config KVM | |||
| 28 | depends on PCI | 24 | depends on PCI |
| 29 | select PREEMPT_NOTIFIERS | 25 | select PREEMPT_NOTIFIERS |
| 30 | select ANON_INODES | 26 | select ANON_INODES |
| 27 | select HAVE_KVM_IRQCHIP | ||
| 31 | ---help--- | 28 | ---help--- |
| 32 | Support hosting fully virtualized guest machines using hardware | 29 | Support hosting fully virtualized guest machines using hardware |
| 33 | virtualization extensions. You will need a fairly recent | 30 | virtualization extensions. You will need a fairly recent |
diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig index 5a152a52796f..46019dccce1c 100644 --- a/arch/powerpc/kvm/Kconfig +++ b/arch/powerpc/kvm/Kconfig | |||
| @@ -2,8 +2,7 @@ | |||
| 2 | # KVM configuration | 2 | # KVM configuration |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | config HAVE_KVM_IRQCHIP | 5 | source "virt/kvm/Kconfig" |
| 6 | bool | ||
| 7 | 6 | ||
| 8 | menuconfig VIRTUALIZATION | 7 | menuconfig VIRTUALIZATION |
| 9 | bool "Virtualization" | 8 | bool "Virtualization" |
diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig index 3e260b7e37b2..ad75ce33be12 100644 --- a/arch/s390/kvm/Kconfig +++ b/arch/s390/kvm/Kconfig | |||
| @@ -1,11 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # KVM configuration | 2 | # KVM configuration |
| 3 | # | 3 | # |
| 4 | config HAVE_KVM | 4 | source "virt/kvm/Kconfig" |
| 5 | bool | ||
| 6 | |||
| 7 | config HAVE_KVM_IRQCHIP | ||
| 8 | bool | ||
| 9 | 5 | ||
| 10 | menuconfig VIRTUALIZATION | 6 | menuconfig VIRTUALIZATION |
| 11 | bool "Virtualization" | 7 | bool "Virtualization" |
diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig index 8600a09e0c6c..939b1cb9c5b3 100644 --- a/arch/x86/kvm/Kconfig +++ b/arch/x86/kvm/Kconfig | |||
| @@ -1,12 +1,8 @@ | |||
| 1 | # | 1 | # |
| 2 | # KVM configuration | 2 | # KVM configuration |
| 3 | # | 3 | # |
| 4 | config HAVE_KVM | ||
| 5 | bool | ||
| 6 | 4 | ||
| 7 | config HAVE_KVM_IRQCHIP | 5 | source "virt/kvm/Kconfig" |
| 8 | bool | ||
| 9 | default y | ||
| 10 | 6 | ||
| 11 | menuconfig VIRTUALIZATION | 7 | menuconfig VIRTUALIZATION |
| 12 | bool "Virtualization" | 8 | bool "Virtualization" |
| @@ -29,6 +25,7 @@ config KVM | |||
| 29 | select PREEMPT_NOTIFIERS | 25 | select PREEMPT_NOTIFIERS |
| 30 | select MMU_NOTIFIER | 26 | select MMU_NOTIFIER |
| 31 | select ANON_INODES | 27 | select ANON_INODES |
| 28 | select HAVE_KVM_IRQCHIP | ||
| 32 | ---help--- | 29 | ---help--- |
| 33 | Support hosting fully virtualized guest machines using hardware | 30 | Support hosting fully virtualized guest machines using hardware |
| 34 | virtualization extensions. You will need a fairly recent | 31 | virtualization extensions. You will need a fairly recent |
diff --git a/virt/kvm/Kconfig b/virt/kvm/Kconfig new file mode 100644 index 000000000000..79e83fc00dc7 --- /dev/null +++ b/virt/kvm/Kconfig | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | # KVM common configuration items and defaults | ||
| 2 | |||
| 3 | config HAVE_KVM | ||
| 4 | bool | ||
| 5 | |||
| 6 | config HAVE_KVM_IRQCHIP | ||
| 7 | bool | ||