KVM: ppc: Remove duplicate function
This was left behind from some code movement. Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com> Signed-off-by: Avi Kivity <avi@qumranet.com>
This commit is contained in:
Родитель
e52b2af541
Коммит
ce263d70e5
|
@ -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
|
* kvmppc_handle_exit
|
||||||
*
|
*
|
||||||
|
|
|
@ -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,
|
extern int kvmppc_emulate_instruction(struct kvm_run *run,
|
||||||
struct kvm_vcpu *vcpu);
|
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,
|
extern void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gfn_t gfn,
|
||||||
u64 asid, u32 flags);
|
u64 asid, u32 flags);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче