From: Christian Ehrhardt <[EMAIL PROTECTED]> This adds the host portion of the hypercall infrastructure which receives the guest calls - no specific hcall function is implemented in this patch.
Signed-off-by: Christian Ehrhardt <[EMAIL PROTECTED]> --- [diffstat] arch/powerpc/kvm/emulate.c | 27 +++++++++++++++++++++++++++ include/asm-powerpc/kvm_para.h | 2 ++ 2 files changed, 29 insertions(+) [diff] diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c --- a/arch/powerpc/kvm/emulate.c +++ b/arch/powerpc/kvm/emulate.c @@ -203,6 +203,24 @@ kvmppc_set_msr(vcpu, vcpu->arch.srr1); } +static int kvmppc_do_hypercall(struct kvm_vcpu *vcpu) +{ + int ret = 0; + + switch (vcpu->arch.gpr[0]) { + default: + printk(KERN_ERR"unknown hypercall %d\n", vcpu->arch.gpr[0]); + kvmppc_dump_vcpu(vcpu); + ret = -ENOSYS; + } + + vcpu->arch.gpr[11] = ret; + vcpu->arch.pc += 4; /* Advance past hypercall instruction. */ + + return ret; +} + + /* XXX to do: * lhax * lhaux @@ -232,6 +250,15 @@ int advance = 1; switch (get_op(inst)) { + case 0: + if (inst == KVM_HYPERCALL_BIN) { + kvmppc_do_hypercall(vcpu); + advance = 0; /* kvmppc_do_hypercall handles the PC. */ + } else { + printk(KERN_ERR"unknown op %d\n", get_op(inst)); + emulated = EMULATE_FAIL; + } + break; case 3: /* trap */ printk("trap!\n"); kvmppc_queue_exception(vcpu, BOOKE_INTERRUPT_PROGRAM); diff --git a/include/asm-powerpc/kvm_para.h b/include/asm-powerpc/kvm_para.h --- a/include/asm-powerpc/kvm_para.h +++ b/include/asm-powerpc/kvm_para.h @@ -22,6 +22,8 @@ #ifdef __KERNEL__ +#define KVM_HYPERCALL_BIN 0x03ffffff + static inline int kvm_para_available(void) { return 0; _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev