From patchwork Tue Nov 24 03:33:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haozhong Zhang X-Patchwork-Id: 7687411 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 665149F96D for ; Tue, 24 Nov 2015 03:34:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AC50520871 for ; Tue, 24 Nov 2015 03:34:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 780532087A for ; Tue, 24 Nov 2015 03:34:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752846AbbKXDeO (ORCPT ); Mon, 23 Nov 2015 22:34:14 -0500 Received: from mga02.intel.com ([134.134.136.20]:39243 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752760AbbKXDeF (ORCPT ); Mon, 23 Nov 2015 22:34:05 -0500 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP; 23 Nov 2015 19:34:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,338,1444719600"; d="scan'208";a="606081680" Received: from hzzhang-optiplex-9020.sh.intel.com (HELO localhost) ([10.239.12.31]) by FMSMGA003.fm.intel.com with ESMTP; 23 Nov 2015 19:34:03 -0800 From: Haozhong Zhang To: , Eduardo Habkost , "Dr. David Alan Gilbert" Cc: Paolo Bonzini , Richard Henderson , "Michael S. Tsirkin" , , Marcelo Tosatti , kvm@vger.kernel.org, Haozhong Zhang Subject: [PATCH v6 1/3] target-i386: fallback vcpu's TSC rate to value returned by KVM Date: Tue, 24 Nov 2015 11:33:55 +0800 Message-Id: <1448336037-6035-2-git-send-email-haozhong.zhang@intel.com> X-Mailer: git-send-email 2.4.8 In-Reply-To: <1448336037-6035-1-git-send-email-haozhong.zhang@intel.com> References: <1448336037-6035-1-git-send-email-haozhong.zhang@intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Eduardo Habkost Reviewed-by: Eduardo Habkost --- 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)); }