Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abe6655d authored by Marcelo Tosatti's avatar Marcelo Tosatti Committed by Avi Kivity
Browse files

KVM: x86: disable kvmclock on non constant TSC hosts 



This is better.

Currently, this code path is posing us big troubles,
and we won't have a decent patch in time. So, temporarily
disable it.

Signed-off-by: default avatarGlauber Costa <glommer@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent d2a8284e

arch/x86/kvm/x86.c

+3 −1
Original line number Diff line number Diff line
@@ -967,7 +967,6 @@ int kvm_dev_ioctl_check_extension(long ext) 
	case KVM_CAP_MMU_SHADOW_CACHE_CONTROL:

	case KVM_CAP_SET_TSS_ADDR:

	case KVM_CAP_EXT_CPUID:

	case KVM_CAP_CLOCKSOURCE:

	case KVM_CAP_PIT:

	case KVM_CAP_NOP_IO_DELAY:

	case KVM_CAP_MP_STATE:
@@ -992,6 +991,9 @@ int kvm_dev_ioctl_check_extension(long ext) 
	case KVM_CAP_IOMMU:

		r = iommu_found();

		break;

	case KVM_CAP_CLOCKSOURCE:

		r = boot_cpu_has(X86_FEATURE_CONSTANT_TSC);

		break;

	default:

		r = 0;

		break;