Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f0412c1 authored by Roel Kluin's avatar Roel Kluin Committed by Marcelo Tosatti
Browse files

KVM: ia64: remove redundant kvm_get_exit_data() NULL tests 



kvm_get_exit_data() cannot return a NULL pointer.

Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 4610c83c

arch/ia64/kvm/kvm_fw.c

+13 −15
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static void set_pal_result(struct kvm_vcpu *vcpu, 
	struct exit_ctl_data *p;



	p = kvm_get_exit_data(vcpu);

	if (p && p->exit_reason == EXIT_REASON_PAL_CALL) {

	if (p->exit_reason == EXIT_REASON_PAL_CALL) {

		p->u.pal_data.ret = result;

		return ;

	}
@@ -87,7 +87,7 @@ static void set_sal_result(struct kvm_vcpu *vcpu, 
	struct exit_ctl_data *p;



	p = kvm_get_exit_data(vcpu);

	if (p && p->exit_reason == EXIT_REASON_SAL_CALL) {

	if (p->exit_reason == EXIT_REASON_SAL_CALL) {

		p->u.sal_data.ret = result;

		return ;

	}
@@ -322,7 +322,7 @@ static u64 kvm_get_pal_call_index(struct kvm_vcpu *vcpu) 
	struct exit_ctl_data *p;



	p = kvm_get_exit_data(vcpu);

	if (p && (p->exit_reason == EXIT_REASON_PAL_CALL))

	if (p->exit_reason == EXIT_REASON_PAL_CALL)

		index = p->u.pal_data.gr28;



	return index;
@@ -646,7 +646,6 @@ static void kvm_get_sal_call_data(struct kvm_vcpu *vcpu, u64 *in0, u64 *in1, 


	p = kvm_get_exit_data(vcpu);



	if (p) {

	if (p->exit_reason == EXIT_REASON_SAL_CALL) {

		*in0 = p->u.sal_data.in0;

		*in1 = p->u.sal_data.in1;
@@ -658,7 +657,6 @@ static void kvm_get_sal_call_data(struct kvm_vcpu *vcpu, u64 *in0, u64 *in1, 
		*in7 = p->u.sal_data.in7;

		return ;

	}

	}

	*in0 = 0;

}