Received: by 2002:a25:ef43:0:0:0:0:0 with SMTP id w3csp361762ybm; Fri, 29 May 2020 01:58:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyzSKknkp8uuwHak1HvYQKxsEKtqaBAMCUT15AbGT0LmxLMdetHOuY89kcOgzFKhVgVngw7 X-Received: by 2002:a05:6402:1a29:: with SMTP id be9mr7016768edb.70.1590742706762; Fri, 29 May 2020 01:58:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590742706; cv=none; d=google.com; s=arc-20160816; b=bP6VZsOySFKykKBz5h/YQWUjpz9bk6/YJ7EYg7bfEyNVDV5djEcoG6zbtVjVO3JscI qQG4tT4zlvPBt+CoUh/h8+rpL/KAcX6GVubf+bSnBMVUIrB63VdBmC/ARt2iUBqOQ+j3 I4foTqseNrTdFcQa0W5xta0CxIOS6Ic74qP4vVHzOxfkqry+y10NAOEgDC9/rCSrlsaK 4xTzOKpaffMgyp8H7Zwg399cQHMYQemMdBYTZlVQFBleqUJqsOYkKjfIzHP2661icwBf DOp6GS42qin5nQl5EAcPsosH1lpTGwyPV1xN6FUOclcoB2f7SRdRddW6+lCPlC+q3wwC EtSw== 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=eM0cFh9jWlINGyYGA5hZLawj/5BBZht1qb8Z9aZfGVA=; b=IrOOYv9xNdQqVWv3bO/h8IbLl3JFkjuilJLvAG+LBB67pfkDpbZzfFnEiqDUo6+607 hKyXK+Qyh2NGzfQwhkLmniNNyUvi0+RweWjp1G1l6/bQX1imL8IMjgdPlNAvQMIoV86l 1pmsd3nlCZT0IQ7/E09qJwefKIsSVDukL7LUcnKN1mY/SLHk9OVc4dtGb4dOwiBu6Q8W uMI9jJsn1xo878FpfJrZL5GTmIBq3nxWpPXr7tn1yNppiV/BjoWcxMolUG6ouy1kPVp/ dWg07kWSZ0UEHMRoVFFkv5OSNBdhzAiZNlQR6NhcLEAN4yCKcUJHSgXe66WMI8W2WWxv Bp1A== 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 9si5452211ejf.668.2020.05.29.01.58.03; Fri, 29 May 2020 01:58:26 -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 S1727117AbgE2I4E (ORCPT + 99 others); Fri, 29 May 2020 04:56:04 -0400 Received: from mga02.intel.com ([134.134.136.20]:44061 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725993AbgE2I4C (ORCPT ); Fri, 29 May 2020 04:56:02 -0400 IronPort-SDR: WxJkzpnS8bDXDm2lCuncZDYLSDPiJSH4+wTSwS3YpO8TxWo2NRUIxtpYXj59gef5j7AuO1T5N3 p/cywoL6zQoA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 May 2020 01:56:01 -0700 IronPort-SDR: 5shGSAVwEKjtV1RbYK//3o9TjwmJcuv2BDBt8G48VHECR28DliVPPnUFdWSLcu1LeFsagqTn9V FEnfmoZyQ6iQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,448,1583222400"; d="scan'208";a="311188383" Received: from lxy-dell.sh.intel.com ([10.239.159.21]) by FMSMGA003.fm.intel.com with ESMTP; 29 May 2020 01:55:59 -0700 From: Xiaoyao Li To: Paolo Bonzini , Sean Christopherson , kvm@vger.kernel.org Cc: Vitaly Kuznetsov , Jim Mattson , linux-kernel@vger.kernel.org, Xiaoyao Li Subject: [PATCH 6/6] KVM: X86: Move kvm_apic_set_version() to kvm_update_state_based_on_cpuid() Date: Fri, 29 May 2020 16:55:45 +0800 Message-Id: <20200529085545.29242-7-xiaoyao.li@intel.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200529085545.29242-1-xiaoyao.li@intel.com> References: <20200529085545.29242-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_state_based_on_cpuid(). 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 5d4da8970940..eb60098aca29 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -127,6 +127,8 @@ void kvm_update_state_based_on_cpuid(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); @@ -228,7 +230,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_state_based_on_cpuid(vcpu); @@ -257,7 +258,6 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu, goto out; } - kvm_apic_set_version(vcpu); kvm_update_cpuid(vcpu); kvm_update_state_based_on_cpuid(vcpu); out: -- 2.18.2