KVM: SVM: remove redundant ret variable
PATCH 1/1 KVM: SVM: remove redundant ret variable
From: zhang songyi <[email protected]>
Return value from svm_nmi_blocked() directly instead of taking this in another redundant variable.
Signed-off-by zhang songyi <[email protected]>
--- arch/x86/kvm/svm/svm.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
arch/x86/kvm/svm/svm.c +2 -5
@@ -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)
--
2.15.2
Quoted 4 lines · On Mon, 28 Nov 2022 20:03:38 +0800, [email protected] 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