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

Commit c402a3f4 authored by Bharat Bhushan's avatar Bharat Bhushan Committed by Alexander Graf
Browse files

Rename EMULATE_DO_PAPR to EMULATE_EXIT_USER 



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: default avatarBharat Bhushan <bharat.bhushan@freescale.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 092d62ee

arch/powerpc/include/asm/kvm_ppc.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ enum emulation_result { 
	EMULATE_DO_DCR,       /* kvm_run filled with DCR request */

	EMULATE_FAIL,         /* can't emulate this instruction */

	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);

arch/powerpc/kvm/book3s_emulate.c

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu, 
				run->papr_hcall.args[i] = gpr;

			}



			emulated = EMULATE_DO_PAPR;

			emulated = EMULATE_EXIT_USER;

			break;

		}

#endif

arch/powerpc/kvm/book3s_pr.c

+1 −1
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, 
			run->exit_reason = KVM_EXIT_MMIO;

			r = RESUME_HOST_NV;

			break;

		case EMULATE_DO_PAPR:

		case EMULATE_EXIT_USER:

			run->exit_reason = KVM_EXIT_PAPR_HCALL;

			vcpu->arch.hcall_needed = 1;

			r = RESUME_HOST_NV;