diff mbox series

[linux-next] KVM: SVM: remove redundant ret variable

Message ID 202211282003389362484@zte.com.cn (mailing list archive)
State New, archived
Headers show
Series [linux-next] KVM: SVM: remove redundant ret variable | expand

Commit Message

zhang.songyi@zte.com.cn Nov. 28, 2022, 12:03 p.m. UTC 
From: zhang songyi <zhang.songyi@zte.com.cn>

Return value from svm_nmi_blocked() directly instead of taking
this in another redundant variable.

Signed-off-by: zhang songyi <zhang.songyi@zte.com.cn>
---
 arch/x86/kvm/svm/svm.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

--
2.15.2

Comments

Sean Christopherson Jan. 19, 2023, 9:03 p.m. UTC | #1 
On Mon, 28 Nov 2022 20:03:38 +0800, zhang.songyi@zte.com.cn wrote:
> Return value from svm_nmi_blocked() directly instead of taking
> this in another redundant variable.
> 
> 

Applied to kvm-x86 svm, thanks!

[1/1] KVM: SVM: remove redundant ret variable
      https://github.com/kvm-x86/linux/commit/7cf431985767

--
https://github.com/kvm-x86/linux/tree/next
https://github.com/kvm-x86/linux/tree/fixes
diff mbox series

Patch

diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index ce362e88a567..416812f971f2 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -3572,7 +3572,6 @@  bool svm_nmi_blocked(struct kvm_vcpu *vcpu)
 {
        struct vcpu_svm *svm = to_svm(vcpu);
        struct vmcb *vmcb = svm->vmcb;
-       bool ret;

        if (!gif_set(svm))
                return true;
@@ -3580,10 +3579,8 @@  bool svm_nmi_blocked(struct kvm_vcpu *vcpu)
        if (is_guest_mode(vcpu) && nested_exit_on_nmi(svm))
                return false;

-       ret = (vmcb->control.int_state & SVM_INTERRUPT_SHADOW_MASK) ||
-             (vcpu->arch.hflags & HF_NMI_MASK);
-
-       return ret;
+       return (vmcb->control.int_state & SVM_INTERRUPT_SHADOW_MASK) ||
+              (vcpu->arch.hflags & HF_NMI_MASK);
 }

 static int svm_nmi_allowed(struct kvm_vcpu *vcpu, bool for_injection)