Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3539747ybt; Tue, 23 Jun 2020 05:01:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8+VzsAjhopiP5NIWoH2xU4LN7oNiSYBqeZCswBe499ZNlxIm9idFUneFfQBikYShyNzof X-Received: by 2002:a17:906:1e92:: with SMTP id e18mr20795075ejj.254.1592913663343; Tue, 23 Jun 2020 05:01:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592913663; cv=none; d=google.com; s=arc-20160816; b=FhTu2m5GlpKbDRGapXj2gSdl5U0gHd+VFZb3+bn7z2fuWtWrg8pdPYXXMleaXHjDKm YQ5NdxPXBPCVrwqhSpRku5n3Q0eVc45Zk29Lq05RZPUhY+qh3dEdy3d08C8HSWaX0Gw3 UCNBzPvq39c0dqI8JnG+XsupMfbOiUVjJk2AXrl77NziO5ksUI9fpfh4o+ziH6SRgJFN Mg5tYoYPQd6xaOZHS3WC+nDNVQU5vZJiODzdql4mMAG62j+bCdxpjJWjr/TOwPTGk4Fd I3Z3KumKBwP8kjh9T3rjKyTl1lkV4hJEBjAM0t4QJrm4n59g4CBd7CuYcOhwCtZ2/1uE VkXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:ironport-sdr:ironport-sdr; bh=vKcjb1EsJVSkW/d6/pa8SioUnAj2cYnp8g3vDsI05H4=; b=ovCDy8Bwkyp9/VMOieCKMsHglwz7W8Gja3HL8FCC3zG+8oR6GFUAFNQdbBYLmIyX5u 8tl4qjzOqcBg74O71rughxFvCLibHa+gcewFpByPM5u88RGMOwCLW94mbhvsm7oVix4K HW8Kbz9QjZRhbXZvUsxRrouEq7Vl0AKPQPZIU0CTiC2Jqm4mZgyQNLh2KVRzq1QecS7K vu6WM88H4R7xn1HmGZm7ZnLPUg/f6UOqfDzd5ErwkIYRKXiEc/Lb93DYImlWeahr4MDj 8V01FY89UTBtPMuS468cu4mU5DcESCgF/7acY85RTiu4GmCXVQUR4LMeIXMzWaXr2abO +Bcg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b18si4757794eju.78.2020.06.23.05.00.39; Tue, 23 Jun 2020 05:01:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732608AbgFWL6l (ORCPT + 99 others); Tue, 23 Jun 2020 07:58:41 -0400 Received: from mga05.intel.com ([192.55.52.43]:58510 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732593AbgFWL6i (ORCPT ); Tue, 23 Jun 2020 07:58:38 -0400 IronPort-SDR: 0qK9wSJkTcb0f/V66sdW4ec1DOKIBUIO18TZX7/jGOBB5t44MTzRI9TFN0iUkRM6mxAGer/i6v 5DS/qTJImwVA== X-IronPort-AV: E=McAfee;i="6000,8403,9660"; a="228710147" X-IronPort-AV: E=Sophos;i="5.75,271,1589266800"; d="scan'208";a="228710147" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2020 04:58:38 -0700 IronPort-SDR: 0HTZHbEmA/vtz9h8VCgPRhMyjRNWVRoymmJLdvfL30htg9WgKMH/6lfSNLB1wpdJyZCL6Bmzbc kGeTz78LPuqw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,271,1589266800"; d="scan'208";a="285746261" Received: from lxy-dell.sh.intel.com ([10.239.159.21]) by orsmga007.jf.intel.com with ESMTP; 23 Jun 2020 04:58:35 -0700 From: Xiaoyao Li To: Paolo Bonzini , Sean Christopherson , Vitaly Kuznetsov Cc: Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Xiaoyao Li Subject: [PATCH v2 7/7] KVM: X86: Move kvm_apic_set_version() to kvm_update_vcpu_model() Date: Tue, 23 Jun 2020 19:58:16 +0800 Message-Id: <20200623115816.24132-8-xiaoyao.li@intel.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200623115816.24132-1-xiaoyao.li@intel.com> References: <20200623115816.24132-1-xiaoyao.li@intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Obviously, kvm_apic_set_version() fits well in kvm_update_vcpu_model(). Signed-off-by: Xiaoyao Li --- arch/x86/kvm/cpuid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 5decc2dd5448..3428f4d84b42 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -129,6 +129,8 @@ void kvm_update_vcpu_model(struct kvm_vcpu *vcpu) apic->lapic_timer.timer_mode_mask = 3 << 17; else apic->lapic_timer.timer_mode_mask = 1 << 17; + + kvm_apic_set_version(vcpu); } best = kvm_find_cpuid_entry(vcpu, 0xD, 0); @@ -226,7 +228,6 @@ int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu, } cpuid_fix_nx_cap(vcpu); - kvm_apic_set_version(vcpu); kvm_update_cpuid(vcpu); kvm_update_vcpu_model(vcpu); @@ -255,7 +256,6 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu, goto out; } - kvm_apic_set_version(vcpu); kvm_update_cpuid(vcpu); kvm_update_vcpu_model(vcpu); out: -- 2.18.2