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

Commit 8963221d authored by Alexander Graf's avatar Alexander Graf Committed by Avi Kivity
Browse files

KVM: PPC: Split instruction reading out 



The current check_ext function reads the instruction and then does
the checking. Let's split the reading out so we can reuse it for
different functions.

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

arch/powerpc/kvm/book3s.c

+16 −8
Original line number Original line Diff line number Diff line
@@ -651,26 +651,34 @@ void kvmppc_giveup_ext(struct kvm_vcpu *vcpu, ulong msr) 
	kvmppc_recalc_shadow_msr(vcpu);

	kvmppc_recalc_shadow_msr(vcpu);

}

}





static int kvmppc_check_ext(struct kvm_vcpu *vcpu, unsigned int exit_nr)

static int kvmppc_read_inst(struct kvm_vcpu *vcpu)

{

{

	ulong srr0 = vcpu->arch.pc;

	ulong srr0 = vcpu->arch.pc;

	int ret;

	int ret;





	/* Need to do paired single emulation? */

	if (!(vcpu->arch.hflags & BOOK3S_HFLAG_PAIRED_SINGLE))

		return EMULATE_DONE;



	/* Read out the instruction */

	ret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &vcpu->arch.last_inst, false);

	ret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &vcpu->arch.last_inst, false);

	if (ret == -ENOENT) {

	if (ret == -ENOENT) {

		vcpu->arch.msr = kvmppc_set_field(vcpu->arch.msr, 33, 33, 1);

		vcpu->arch.msr = kvmppc_set_field(vcpu->arch.msr, 33, 33, 1);

		vcpu->arch.msr = kvmppc_set_field(vcpu->arch.msr, 34, 36, 0);

		vcpu->arch.msr = kvmppc_set_field(vcpu->arch.msr, 34, 36, 0);

		vcpu->arch.msr = kvmppc_set_field(vcpu->arch.msr, 42, 47, 0);

		vcpu->arch.msr = kvmppc_set_field(vcpu->arch.msr, 42, 47, 0);

		kvmppc_book3s_queue_irqprio(vcpu, BOOK3S_INTERRUPT_INST_STORAGE);

		kvmppc_book3s_queue_irqprio(vcpu, BOOK3S_INTERRUPT_INST_STORAGE);

	} else if(ret == EMULATE_DONE) {

		return EMULATE_AGAIN;

	}



	return EMULATE_DONE;

}



static int kvmppc_check_ext(struct kvm_vcpu *vcpu, unsigned int exit_nr)

{



	/* Need to do paired single emulation? */

	if (!(vcpu->arch.hflags & BOOK3S_HFLAG_PAIRED_SINGLE))

		return EMULATE_DONE;



	/* Read out the instruction */

	if (kvmppc_read_inst(vcpu) == EMULATE_DONE)

		/* Need to emulate */

		/* Need to emulate */

		return EMULATE_FAIL;

		return EMULATE_FAIL;

	}





	return EMULATE_AGAIN;

	return EMULATE_AGAIN;

}

}