From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: Re: [PATCH 3/3] qemu-x86: Set tsc_khz in kvm when supported Date: Tue, 19 Jul 2011 19:03:34 +0200 Message-ID: <4E25B8E6.5050705@siemens.com> References: <1310047993-7649-1-git-send-email-joerg.roedel@amd.com> <1310047993-7649-4-git-send-email-joerg.roedel@amd.com> <20110719114856.GB28500@amt.cnet> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Avi Kivity , kvm@vger.kernel.org, qemu-devel@nongnu.org To: Marcelo Tosatti , Joerg Roedel Return-path: Received: from goliath.siemens.de ([192.35.17.28]:30460 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751001Ab1GSRDm (ORCPT ); Tue, 19 Jul 2011 13:03:42 -0400 In-Reply-To: <20110719114856.GB28500@amt.cnet> Sender: kvm-owner@vger.kernel.org List-ID: On 2011-07-19 13:48, Marcelo Tosatti wrote: > On Thu, Jul 07, 2011 at 04:13:13PM +0200, Joerg Roedel wrote: >> 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 > #ifdef times are over, please clean up before pushing upstream. Jan -- Siemens AG, Corporate Technology, CT T DE IT 1 Corporate Competence Center Embedded Linux From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:35219) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjDhu-0003U3-9s for qemu-devel@nongnu.org; Tue, 19 Jul 2011 13:03:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QjDhr-0005hW-TV for qemu-devel@nongnu.org; Tue, 19 Jul 2011 13:03:41 -0400 Received: from goliath.siemens.de ([192.35.17.28]:18932) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjDhr-0005hL-F1 for qemu-devel@nongnu.org; Tue, 19 Jul 2011 13:03:39 -0400 Message-ID: <4E25B8E6.5050705@siemens.com> Date: Tue, 19 Jul 2011 19:03:34 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <1310047993-7649-1-git-send-email-joerg.roedel@amd.com> <1310047993-7649-4-git-send-email-joerg.roedel@amd.com> <20110719114856.GB28500@amt.cnet> In-Reply-To: <20110719114856.GB28500@amt.cnet> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [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: Marcelo Tosatti , Joerg Roedel Cc: Avi Kivity , kvm@vger.kernel.org, qemu-devel@nongnu.org On 2011-07-19 13:48, Marcelo Tosatti wrote: > On Thu, Jul 07, 2011 at 04:13:13PM +0200, Joerg Roedel wrote: >> 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 > #ifdef times are over, please clean up before pushing upstream. Jan -- Siemens AG, Corporate Technology, CT T DE IT 1 Corporate Competence Center Embedded Linux