Commit 3d5e7a28 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: x86: avoid warning with -Wbitwise-instead-of-logical 



This is a new warning in clang top-of-tree (will be clang 14):

In file included from arch/x86/kvm/mmu/mmu.c:27:
arch/x86/kvm/mmu/spte.h:318:9: error: use of bitwise '|' with boolean operands [-Werror,-Wbitwise-instead-of-logical]
        return __is_bad_mt_xwr(rsvd_check, spte) |
               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                                 ||
arch/x86/kvm/mmu/spte.h:318:9: note: cast one or both operands to int to silence this warning

The code is fine, but change it anyway to shut up this clever clogs
of a compiler.

Reported-by: default avatar <torvic9@mailbox.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a25c78d0

arch/x86/kvm/mmu/spte.h

+1 −6
Original line number Diff line number Diff line
@@ -310,12 +310,7 @@ static inline bool __is_bad_mt_xwr(struct rsvd_bits_validate *rsvd_check, 
static __always_inline bool is_rsvd_spte(struct rsvd_bits_validate *rsvd_check,

					 u64 spte, int level)

{

	/*

	 * Use a bitwise-OR instead of a logical-OR to aggregate the reserved

	 * bits and EPT's invalid memtype/XWR checks to avoid an extra Jcc

	 * (this is extremely unlikely to be short-circuited as true).

	 */

	return __is_bad_mt_xwr(rsvd_check, spte) |

	return __is_bad_mt_xwr(rsvd_check, spte) ||

	       __is_rsvd_bits_set(rsvd_check, spte, level);

}