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

Commit 79300f8c authored by Alexander Graf's avatar Alexander Graf Committed by Avi Kivity
Browse files

KVM: PPC: e500mc: implicitly set MSR_GS 



When setting MSR for an e500mc guest, we implicitly always set MSR_GS
to make sure the guest is in guest state. Since we have this implicit
rule there, we don't need to explicitly pass MSR_GS to set_msr().

Remove all explicit setters of MSR_GS.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 4ab96919

arch/powerpc/kvm/booke.c

+5 −6
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static int kvmppc_booke_irqprio_deliver(struct kvm_vcpu *vcpu, 
                                        unsigned int priority)

{

	int allowed = 0;

	ulong uninitialized_var(msr_mask);

	ulong msr_mask = 0;

	bool update_esr = false, update_dear = false;

	ulong crit_raw = vcpu->arch.shared->critical;

	ulong crit_r1 = kvmppc_get_gpr(vcpu, 1);
@@ -322,20 +322,19 @@ static int kvmppc_booke_irqprio_deliver(struct kvm_vcpu *vcpu, 
	case BOOKE_IRQPRIO_AP_UNAVAIL:

	case BOOKE_IRQPRIO_ALIGNMENT:

		allowed = 1;

		msr_mask = MSR_GS | MSR_CE | MSR_ME | MSR_DE;

		msr_mask = MSR_CE | MSR_ME | MSR_DE;

		int_class = INT_CLASS_NONCRIT;

		break;

	case BOOKE_IRQPRIO_CRITICAL:

	case BOOKE_IRQPRIO_DBELL_CRIT:

		allowed = vcpu->arch.shared->msr & MSR_CE;

		allowed = allowed && !crit;

		msr_mask = MSR_GS | MSR_ME;

		msr_mask = MSR_ME;

		int_class = INT_CLASS_CRIT;

		break;

	case BOOKE_IRQPRIO_MACHINE_CHECK:

		allowed = vcpu->arch.shared->msr & MSR_ME;

		allowed = allowed && !crit;

		msr_mask = MSR_GS;

		int_class = INT_CLASS_MC;

		break;

	case BOOKE_IRQPRIO_DECREMENTER:
@@ -346,13 +345,13 @@ static int kvmppc_booke_irqprio_deliver(struct kvm_vcpu *vcpu, 
	case BOOKE_IRQPRIO_DBELL:

		allowed = vcpu->arch.shared->msr & MSR_EE;

		allowed = allowed && !crit;

		msr_mask = MSR_GS | MSR_CE | MSR_ME | MSR_DE;

		msr_mask = MSR_CE | MSR_ME | MSR_DE;

		int_class = INT_CLASS_NONCRIT;

		break;

	case BOOKE_IRQPRIO_DEBUG:

		allowed = vcpu->arch.shared->msr & MSR_DE;

		allowed = allowed && !crit;

		msr_mask = MSR_GS | MSR_ME;

		msr_mask = MSR_ME;

		int_class = INT_CLASS_CRIT;

		break;

	}