x86: KVM guest: merge CONFIG_KVM_CLOCK into CONFIG_KVM_GUEST

The distinction between CONFIG_KVM_CLOCK and CONFIG_KVM_GUEST is
not so clear anymore, as demonstrated by recent bugs caused by poor
handling of on/off combinations of these options.

Merge CONFIG_KVM_CLOCK into CONFIG_KVM_GUEST.

Reported-By: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 8 insertions, 13 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 8ec3a1aa4abd..a42e2e99caae 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -573,23 +573,18 @@ config PARAVIRT_TIME_ACCOUNTING
 
 source "arch/x86/xen/Kconfig"
 
-config KVM_CLOCK
-        bool "KVM paravirtualized clock"
-        select PARAVIRT
-        select PARAVIRT_CLOCK
-        ---help---
-          Turning on this option will allow you to run a paravirtualized clock
-          when running over the KVM hypervisor. Instead of relying on a PIT
-          (or probably other) emulation by the underlying device model, the host
-          provides the guest with timing infrastructure such as time of day, and
-          system time
-
 config KVM_GUEST
-        bool "KVM Guest support"
+        bool "KVM Guest support (including kvmclock)"
+        select PARAVIRT
         select PARAVIRT
+        select PARAVIRT_CLOCK
+        default y if PARAVIRT_GUEST
         ---help---
           This option enables various optimizations for running under the KVM
-          hypervisor.
+          hypervisor. It includes a paravirtualized clock, so that instead
+          of relying on a PIT (or probably other) emulation by the
+          underlying device model, the host provides the guest with
+          timing infrastructure such as time of day, and system time
 
 source "arch/x86/lguest/Kconfig"