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

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

KVM: extend EMULATE_EXIT_USER to support different exit reasons 



Currently the instruction emulator code returns EMULATE_EXIT_USER
and common code initializes the "run->exit_reason = .." and
"vcpu->arch.hcall_needed = .." with one fixed reason.
But there can be different reasons when emulator need to exit
to user space. To support that the "run->exit_reason = .."
and "vcpu->arch.hcall_needed = .." initialization is moved a
level up to emulator.

Signed-off-by: default avatarBharat Bhushan <bharat.bhushan@freescale.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent c402a3f4

arch/powerpc/kvm/book3s_emulate.c

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

			}



			run->exit_reason = KVM_EXIT_PAPR_HCALL;

			vcpu->arch.hcall_needed = 1;

			emulated = EMULATE_EXIT_USER;

			break;

		}

arch/powerpc/kvm/book3s_pr.c

+0 −2
Original line number Diff line number Diff line
@@ -763,8 +763,6 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, 
			r = RESUME_HOST_NV;

			break;

		case EMULATE_EXIT_USER:

			run->exit_reason = KVM_EXIT_PAPR_HCALL;

			vcpu->arch.hcall_needed = 1;

			r = RESUME_HOST_NV;

			break;

		default: