From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a14Mq-0001Bw-U0 for qemu-devel@nongnu.org; Mon, 23 Nov 2015 22:34:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a14Mn-0002sS-O6 for qemu-devel@nongnu.org; Mon, 23 Nov 2015 22:34:08 -0500 Received: from mga02.intel.com ([134.134.136.20]:1940) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a14Mn-0002sN-Hq for qemu-devel@nongnu.org; Mon, 23 Nov 2015 22:34:05 -0500 From: Haozhong Zhang Date: Tue, 24 Nov 2015 11:33:55 +0800 Message-Id: <1448336037-6035-2-git-send-email-haozhong.zhang@intel.com> In-Reply-To: <1448336037-6035-1-git-send-email-haozhong.zhang@intel.com> References: <1448336037-6035-1-git-send-email-haozhong.zhang@intel.com> Subject: [Qemu-devel] [PATCH v6 1/3] target-i386: fallback vcpu's TSC rate to value returned by KVM List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Eduardo Habkost , "Dr. David Alan Gilbert" Cc: Haozhong Zhang , kvm@vger.kernel.org, "Michael S. Tsirkin" , Marcelo Tosatti , Paolo Bonzini , afaerber@suse.de, Richard Henderson If no user-specified TSC rate is present, we will try to set env->tsc_khz to the value returned by KVM_GET_TSC_KHZ. This patch does not change the current functionality of QEMU and just prepares for later patches to enable migrating vcpu's TSC rate. Signed-off-by: Haozhong Zhang --- target-i386/kvm.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 2a9953b..a0fe9d4 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -832,6 +832,20 @@ int kvm_arch_init_vcpu(CPUState *cs) } } + /* vcpu's TSC frequency is either specified by user, or following + * the value used by KVM if the former is not present. In the + * latter case, we query it from KVM and record in env->tsc_khz, + * so that vcpu's TSC frequency can be migrated later via this field. + */ + if (!env->tsc_khz) { + r = kvm_check_extension(cs->kvm_state, KVM_CAP_GET_TSC_KHZ) ? + kvm_vcpu_ioctl(cs, KVM_GET_TSC_KHZ) : + -ENOTSUP; + if (r > 0) { + env->tsc_khz = r; + } + } + if (has_xsave) { env->kvm_xsave_buf = qemu_memalign(4096, sizeof(struct kvm_xsave)); } -- 2.4.8