Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp37948508rwd; Wed, 12 Jul 2023 00:26:03 -0700 (PDT) X-Google-Smtp-Source: APBJJlGV+RNKElCYc+tlsFtiTJRxT0fOx5xmrwYFLY/QjY8cHdl02iup8R7s6QUMyIZxxkGl54sH X-Received: by 2002:a17:902:6542:b0:1b9:e9ed:c721 with SMTP id d2-20020a170902654200b001b9e9edc721mr1290847pln.19.1689146763641; Wed, 12 Jul 2023 00:26:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689146763; cv=none; d=google.com; s=arc-20160816; b=AJiliHBny+K43JFTXVN6ufOXSUf4rjhI/RTKtDwDG2AB7PifG8uypKWI1oSvTKlg2r XsVLFUWc4QOhrRm5qqpSox1uRj+cG+t27bYjEwpY/wrJwj/Ig61AqzIo7W2F67a74xZ5 oVTcags97J5LQYagsgKTR5jWTwgkPJRkSiaXT7WD91Cj8BS6wdWiJ1m1dzpQfdEiz9bS LBPYhs+MMyIRxgu+UXl8RBC89ro+vP3SFcZt7gAevVJtI4wJhqLrF2dh8j/EF2bvFHHr /7SsLp+6HmOO/ckbvNUv+/sOnwSQWZ6uoXaGK491yWci03mjge59OR7SGotbsSDMypgL Na6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:message-id:user-agent :references:in-reply-to:subject:cc:to:from:date:mime-version :dkim-signature; bh=IJbWQBg0+xcUlkTK0guwDZjyCDfTZrlizy6RFJOdPCE=; fh=LrM6UCbe2/rGKifJjBaecDdYfub0IPYiVi5WRIqfe/M=; b=CyL5FyxcjvLeTbJxnCTbaXI6nj1j5zUlAK2NeFh5tbGGmv78M2kJhC5nWpxx+ED8Rp OdQotjvCiKLe+S7BQ6T5UYM2RrigL3UPDuYU3afAGZucoG0QhTg7hwxPGQp8+5Al+lWA VdkfOb98A1KOBfi0ZbsCqnPLPT94bIJyv4y2+CFQugWk9Ph2ua34gvWndFWggYrNiBb/ 5PNMRDMSRdYLc+F0wexpi7oMyS7xLfil+xO0Wsa65JlN4SxbNIUoQktUCTXXv6nkgrg+ GWOaNGfsX7CIxouBa2kbHyL40uerK9kJyL1mqt/mboTcII+tuvXxPqBHNTFC6pngA/kD pqPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (bad version) header.i=@208.org header.s=dkim header.b=U5oMjVBy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id km11-20020a17090327cb00b001b9bebb66f8si2752231plb.367.2023.07.12.00.25.51; Wed, 12 Jul 2023 00:26:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=neutral (bad version) header.i=@208.org header.s=dkim header.b=U5oMjVBy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231847AbjGLG4z (ORCPT + 99 others); Wed, 12 Jul 2023 02:56:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47592 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230393AbjGLG4w (ORCPT ); Wed, 12 Jul 2023 02:56:52 -0400 Received: from mail.208.org (unknown [183.242.55.162]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56D68188 for ; Tue, 11 Jul 2023 23:56:48 -0700 (PDT) Received: from mail.208.org (email.208.org [127.0.0.1]) by mail.208.org (Postfix) with ESMTP id 4R17nm6JZbzBR5lK for ; Wed, 12 Jul 2023 14:56:44 +0800 (CST) Authentication-Results: mail.208.org (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=208.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=208.org; h= content-transfer-encoding:content-type:message-id:user-agent :references:in-reply-to:subject:to:from:date:mime-version; s= dkim; t=1689145004; x=1691737005; bh=ME+14FPzHJvO2DOIGZOPDwe7CdJ /x6/pUpF5TJPDMTA=; b=U5oMjVByBxSQM1Vvx3RTPFbejSMoKyIl0kQ8iWEb7ba BJKRrHReR3HaFncTz3e1VETipauvSylsAiGlf03c/pOQeIeIqzxnNWcv1v7G3sds K/3CF1eTWIRv49jBOr4TOcaGKbKdqE9NWQtQ1i6FNKJmHm4wT8W0bf/pZW9TnXCC bPGXCeQRoQ0gZqXGsUJpVTfQ6jdf3mHwhZp3pQ99EVCyHUjZHOvpGMIdmulLAIDf t4RvvU/Bs6TGvcr29tg3iFTxNO3ZdWXG8FPJlf0lBsKxzZeIAGEYSrb2L43L9bgW KtUbSUzQ59C+qJl9lN+nJ9WA2EleM4V3EkEY2XfWp6A== X-Virus-Scanned: amavisd-new at mail.208.org Received: from mail.208.org ([127.0.0.1]) by mail.208.org (mail.208.org [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id pffMnJorR6C2 for ; Wed, 12 Jul 2023 14:56:44 +0800 (CST) Received: from localhost (email.208.org [127.0.0.1]) by mail.208.org (Postfix) with ESMTPSA id 4R17nl2qYyzBR5lH; Wed, 12 Jul 2023 14:56:43 +0800 (CST) MIME-Version: 1.0 Date: Wed, 12 Jul 2023 14:56:43 +0800 From: shijie001@208suo.com To: tglx@linutronix.d, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org Cc: hpa@zytor.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] KVM: x86: Fix warnings in kvm_cache_regs.h In-Reply-To: References: User-Agent: Roundcube Webmail Message-ID: X-Sender: shijie001@208suo.com Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,RCVD_IN_DNSWL_BLOCKED,RDNS_NONE,SPF_HELO_FAIL,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following checkpatch warnings are removed: WARNING: Missing a blank line after declarations Signed-off-by: Jie Shi --- arch/x86/kvm/kvm_cache_regs.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/kvm/kvm_cache_regs.h b/arch/x86/kvm/kvm_cache_regs.h index 75eae9c4998a..0e3808b40974 100644 --- a/arch/x86/kvm/kvm_cache_regs.h +++ b/arch/x86/kvm/kvm_cache_regs.h @@ -151,6 +151,7 @@ static inline void kvm_pdptr_write(struct kvm_vcpu *vcpu, int index, u64 value) static inline ulong kvm_read_cr0_bits(struct kvm_vcpu *vcpu, ulong mask) { ulong tmask = mask & KVM_POSSIBLE_CR0_GUEST_BITS; + if ((tmask & vcpu->arch.cr0_guest_owned_bits) && !kvm_register_is_available(vcpu, VCPU_EXREG_CR0)) static_call(kvm_x86_cache_reg)(vcpu, VCPU_EXREG_CR0); @@ -173,6 +174,7 @@ static inline ulong kvm_read_cr0(struct kvm_vcpu *vcpu) static inline ulong kvm_read_cr4_bits(struct kvm_vcpu *vcpu, ulong mask) { ulong tmask = mask & KVM_POSSIBLE_CR4_GUEST_BITS; + if ((tmask & vcpu->arch.cr4_guest_owned_bits) && !kvm_register_is_available(vcpu, VCPU_EXREG_CR4)) static_call(kvm_x86_cache_reg)(vcpu, VCPU_EXREG_CR4);