From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:55215) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QepKm-0007lS-KH for qemu-devel@nongnu.org; Thu, 07 Jul 2011 10:13:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QepKg-0001bp-K8 for qemu-devel@nongnu.org; Thu, 07 Jul 2011 10:13:40 -0400 Received: from ch1ehsobe005.messaging.microsoft.com ([216.32.181.185]:37452 helo=CH1EHSOBE004.bigfish.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QepKf-0001bK-Ub for qemu-devel@nongnu.org; Thu, 07 Jul 2011 10:13:34 -0400 From: Joerg Roedel Date: Thu, 7 Jul 2011 16:13:13 +0200 Message-ID: <1310047993-7649-4-git-send-email-joerg.roedel@amd.com> In-Reply-To: <1310047993-7649-1-git-send-email-joerg.roedel@amd.com> References: <1310047993-7649-1-git-send-email-joerg.roedel@amd.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH 3/3] qemu-x86: Set tsc_khz in kvm when supported List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity , Marcelo Tosatti Cc: Joerg Roedel , qemu-devel@nongnu.org, kvm@vger.kernel.org Make use of the KVM_TSC_CONTROL feature if available. Signed-off-by: Joerg Roedel --- target-i386/kvm.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 10fb2c4..923d2d5 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -354,6 +354,7 @@ int kvm_arch_init_vcpu(CPUState *env) uint32_t unused; struct kvm_cpuid_entry2 *c; uint32_t signature[3]; + int r; env->cpuid_features &= kvm_arch_get_supported_cpuid(s, 1, 0, R_EDX); @@ -499,7 +500,22 @@ int kvm_arch_init_vcpu(CPUState *env) qemu_add_vm_change_state_handler(cpu_update_state, env); - return kvm_vcpu_ioctl(env, KVM_SET_CPUID2, &cpuid_data); + r = kvm_vcpu_ioctl(env, KVM_SET_CPUID2, &cpuid_data); + if (r) + return r; + +#ifdef KVM_CAP_TSC_CONTROL + r = kvm_check_extension(env->kvm_state, KVM_CAP_TSC_CONTROL); + if (r && env->tsc_khz) { + r = kvm_vcpu_ioctl(env, KVM_SET_TSC_KHZ, env->tsc_khz); + if (r < 0) { + fprintf(stderr, "KVM_SET_TSC_KHZ failed\n"); + return r; + } + } +#endif + + return 0; } void kvm_arch_reset_vcpu(CPUState *env) -- 1.7.4.1