From patchwork Tue Dec 6 09:20:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hao Peng X-Patchwork-Id: 30168 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2720247wrr; Tue, 6 Dec 2022 01:31:42 -0800 (PST) X-Google-Smtp-Source: AA0mqf44COZcDvPSi09mcbSjUFg7UUC/5mPyh6Vg1ytynH2qvFM2i2RTbwBg5bQc35Y8uvIcw10u X-Received: by 2002:a17:90a:9c5:b0:219:89c3:23a9 with SMTP id 63-20020a17090a09c500b0021989c323a9mr21516184pjo.212.1670319101838; Tue, 06 Dec 2022 01:31:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670319101; cv=none; d=google.com; s=arc-20160816; b=A2WkM7ohhgn14mXhOQoK0Vko4HZEbfYQitI+TJCq+FS9CW5mbCUy+egKn/WaCUCjzu aKqSzBoY9wVdmsi71MMqgfRd0EGGOcRpIeldLFkOUI5IFwzVeSwxfD8ihyHu9uvelc/J 2rLFS0+MvDFm0TQfo+TdyzIn1P1DullKeMQGH/cO/fFw2yGkwKX2FHQRtr8dQppphK84 6ToFlci/COVcm8hqFzMNWilNrnIQMR+TbwyIPvBnUy4KqeM+ak1u2dGU0Xlluc+ap+aY WFreqvd2rB2jZHWfiVOljIP9jJN/rCyCad2k13rn1dp1JRuTbat75xMjk6MHkmjobop0 iJ3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:mime-version :dkim-signature; bh=vPKqXWw7xsVHLyBN+EDFkZ4J8uiiHRqUm/YEFJcGYLU=; b=vo9jRPrDmxFEuA0OoJ3btdr+OOJTovWSwF5szgabZvX118qT+0dSOpnExWLSHtTV6U khkVbkRD+t7CiZfSk+FDm1rGOLIoBMJxA9EmA0mhbOCSVziErfESrGfglPbbZ1u9Ypru E6iutyn4Zb0y7/lMKm+hUsVQzAsjuKnc2rYJekS1ywGra5bI/8PtzeYHfzjYmrv1H1FI i28z8jBfRF6tMrzG0EEhFYFUFq7WHUgfUDrKrfqkgbkCxvrXoZhxGfcLUUQXEgpDL6ig sKPcFnu4/4mYm1UZ84+BN7ItwDhjZ2kDnAbzAhLvcHF260lOmcFm5up3Q7a7miV+1Olk 2Vfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="j/S97HK7"; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s17-20020a170902ea1100b00172f6726d91si17710053plg.565.2022.12.06.01.31.27; Tue, 06 Dec 2022 01:31:41 -0800 (PST) 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=pass header.i=@gmail.com header.s=20210112 header.b="j/S97HK7"; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235006AbiLFJXR (ORCPT + 99 others); Tue, 6 Dec 2022 04:23:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234973AbiLFJWu (ORCPT ); Tue, 6 Dec 2022 04:22:50 -0500 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B4C022B2E; Tue, 6 Dec 2022 01:20:28 -0800 (PST) Received: by mail-wr1-x429.google.com with SMTP id f18so22549561wrj.5; Tue, 06 Dec 2022 01:20:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=vPKqXWw7xsVHLyBN+EDFkZ4J8uiiHRqUm/YEFJcGYLU=; b=j/S97HK7WE0fQCAFzc+ivVICdJxs+QEfktSh/NcVfZne5yHKLlkG98Z/Fq21EMorUg aEHmAjijyugb9nmoW65LE1q1OhezYiI3/Kv/eEHAwgOtfVhdANEQT7HzH70awa61h8JH XZJHefgcM7w20qDJGSbgS3hfCEP0o7Se8nI+tx7t7FTyj4qIWff/H1r5VPl2fhuONq05 +U4nr05Kzb9fgaZLH3HHbzXdWxxkxFyV71D0LztT3SBTjXkQQ2dugXlPUS1uhaYSdU/L AoX2dA5Bu0GVGLVhiYpTWzWQXlxvACj88INjZNKEMdymf/OuxZjNuNQUozlBGXKVRZbI j8Rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=vPKqXWw7xsVHLyBN+EDFkZ4J8uiiHRqUm/YEFJcGYLU=; b=uTb5THpmYuEGXgW/LR8LG0GGeiNNHFSNzh7uQJS4hAcFX8gDCDva/dKgJSNbZyA+ud HoNwOz+EFlApwMw2HYarSOmWULk3Y4OKci9w2c47Z+CfE8AWUPxevrFopsqmePZJ2g+s F/4QL0uh97Rjy5tjHq47l4hmuRii94JsW7FdWlkXNz9xcomXlpqq0iFhv/mOKd+4ptO1 RbyPNXw75o6pd6itCmh4km/O77HfFU0OM9cI8zPNiTIawx+qcCVDRzoY/bmM+6UHRLYB XmSTS718kmdYV0N/GdEEXwNouGpJh7pN7PbWaBUY77Pujs5fJXOGi0IsKwmhxjYY5Xw6 R9cQ== X-Gm-Message-State: ANoB5pkvigWza3dxSf6TaxRQQqQgPbg5e7d4eUb46pwzp3H8BdOAss9H bbDMMnDpHjmPEjuammnpdP9nnLrR8qSnJCVrM8NnvmkgEqM= X-Received: by 2002:adf:e28b:0:b0:241:c2c3:26c8 with SMTP id v11-20020adfe28b000000b00241c2c326c8mr48984132wri.278.1670318426619; Tue, 06 Dec 2022 01:20:26 -0800 (PST) MIME-Version: 1.0 From: Hao Peng Date: Tue, 6 Dec 2022 17:20:15 +0800 Message-ID: Subject: [PATCH] KVM: x86: Simplify kvm_apic_hw_enabled To: pbonzini@redhat.com Cc: kvm@vger.kernel.org, Sean Christopherson , linux-kernel@vger.kernel.org X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751456522254611681?= X-GMAIL-MSGID: =?utf-8?q?1751456522254611681?= From: Peng Hao kvm_apic_hw_enabled() only needs to return bool, there is no place to use the return value of MSR_IA32_APICBASE_ENABLE. Signed-off-by: Peng Hao --- arch/x86/kvm/lapic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.27.0 diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h index 28e3769066e2..58c3242fcc7a 100644 --- a/arch/x86/kvm/lapic.h +++ b/arch/x86/kvm/lapic.h @@ -188,11 +188,11 @@ static inline bool lapic_in_kernel(struct kvm_vcpu *vcpu) extern struct static_key_false_deferred apic_hw_disabled; -static inline int kvm_apic_hw_enabled(struct kvm_lapic *apic) +static inline bool kvm_apic_hw_enabled(struct kvm_lapic *apic) { if (static_branch_unlikely(&apic_hw_disabled.key)) return apic->vcpu->arch.apic_base & MSR_IA32_APICBASE_ENABLE; - return MSR_IA32_APICBASE_ENABLE; + return true; } extern struct static_key_false_deferred apic_sw_disabled;