korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-02 16:44:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename EMULATE_DO_PAPR to EMULATE_EXIT_USER

Browse Source 
Instruction emulation return EMULATE_DO_PAPR when it requires
exit to userspace on book3s. Similar return is required
for booke. EMULATE_DO_PAPR reads out to be confusing so it is
renamed to EMULATE_EXIT_USER.

Signed-off-by: Bharat Bhushan <bharat.bhushan@freescale.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Bharat Bhushan 2013-04-08 00:32:13 +00:00 committed by Alexander Graf
parent 092d62ee93
commit c402a3f457
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/include/asm/kvm_ppc.h
View File

@ -44,7 +44,7 @@ enum emulation_result {
EMULATE_DO_DCR, /* kvm_run filled with DCR request */ EMULATE_DO_DCR, /* kvm_run filled with DCR request */
EMULATE_FAIL, /* can't emulate this instruction */ EMULATE_FAIL, /* can't emulate this instruction */
EMULATE_AGAIN, /* something went wrong. go again */ EMULATE_AGAIN, /* something went wrong. go again */
EMULATE_DO_PAPR, /* kvm_run filled with PAPR request */ EMULATE_EXIT_USER, /* emulation requires exit to user-space */
}; };
extern int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu); extern int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu);

2
arch/powerpc/kvm/book3s_emulate.c
View File

@ -194,7 +194,7 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
run->papr_hcall.args[i] = gpr; run->papr_hcall.args[i] = gpr;
} }
emulated = EMULATE_DO_PAPR; emulated = EMULATE_EXIT_USER;
break; break;
} }
#endif #endif

2
arch/powerpc/kvm/book3s_pr.c
View File

@ -762,7 +762,7 @@ program_interrupt:
run->exit_reason = KVM_EXIT_MMIO; run->exit_reason = KVM_EXIT_MMIO;
r = RESUME_HOST_NV; r = RESUME_HOST_NV;
break; break;
case EMULATE_DO_PAPR: case EMULATE_EXIT_USER:
run->exit_reason = KVM_EXIT_PAPR_HCALL; run->exit_reason = KVM_EXIT_PAPR_HCALL;
vcpu->arch.hcall_needed = 1; vcpu->arch.hcall_needed = 1;
r = RESUME_HOST_NV; r = RESUME_HOST_NV;