2 files changed, 8 insertions, 2 deletions

diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index f6945bef2cd1..94f643484300 100644
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -283,7 +283,14 @@ NOKPROBE_SYMBOL(do_async_page_fault);
 static void __init paravirt_ops_setup(void)
 {
         pv_info.name = "KVM";
-        pv_info.paravirt_enabled = 1;
+
+        /*
+         * KVM isn't paravirt in the sense of paravirt_enabled.  A KVM
+         * guest kernel works like a bare metal kernel with additional
+         * features, and paravirt_enabled is about features that are
+         * missing.
+         */
+        pv_info.paravirt_enabled = 0;
 
         if (kvm_para_has_feature(KVM_FEATURE_NOP_IO_DELAY))
                 pv_cpu_ops.io_delay = kvm_io_delay;
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
index 0bf3467d7f30..42caaef897c8 100644
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@ -261,7 +261,6 @@ void __init kvmclock_init(void)
 #endif
         kvm_get_preset_lpj();
         clocksource_register_hz(&kvm_clock, NSEC_PER_SEC);
-        pv_info.paravirt_enabled = 1;
         pv_info.name = "KVM";
 
         if (kvm_para_has_feature(KVM_FEATURE_CLOCKSOURCE_STABLE_BIT))