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

Commit ce263d70 authored by Hollis Blanchard's avatar Hollis Blanchard Committed by Avi Kivity
Browse files

KVM: ppc: Remove duplicate function 



This was left behind from some code movement.

Signed-off-by: default avatarHollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent e52b2af5

arch/powerpc/kvm/booke_guest.c

+0 −33
Original line number Diff line number Diff line
@@ -227,39 +227,6 @@ void kvmppc_check_and_deliver_interrupts(struct kvm_vcpu *vcpu) 
	}

}



static int kvmppc_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu)

{

	enum emulation_result er;

	int r;



	er = kvmppc_emulate_instruction(run, vcpu);

	switch (er) {

	case EMULATE_DONE:

		/* Future optimization: only reload non-volatiles if they were

		 * actually modified. */

		r = RESUME_GUEST_NV;

		break;

	case EMULATE_DO_MMIO:

		run->exit_reason = KVM_EXIT_MMIO;

		/* We must reload nonvolatiles because "update" load/store

		 * instructions modify register state. */

		/* Future optimization: only reload non-volatiles if they were

		 * actually modified. */

		r = RESUME_HOST_NV;

		break;

	case EMULATE_FAIL:

		/* XXX Deliver Program interrupt to guest. */

		printk(KERN_EMERG "%s: emulation failed (%08x)\n", __func__,

		       vcpu->arch.last_inst);

		r = RESUME_HOST;

		break;

	default:

		BUG();

	}



	return r;

}



/**

 * kvmppc_handle_exit

 *

include/asm-powerpc/kvm_ppc.h

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ extern int kvmppc_handle_store(struct kvm_run *run, struct kvm_vcpu *vcpu, 


extern int kvmppc_emulate_instruction(struct kvm_run *run,

                                      struct kvm_vcpu *vcpu);

extern int kvmppc_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu);



extern void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gfn_t gfn,

                           u64 asid, u32 flags);