@@ -6309,9 +6309,10 @@ static void toggle_interruptibility(struct kvm_vcpu *vcpu, u32 mask)
}
}
-static bool inject_emulated_exception(struct kvm_vcpu *vcpu)
+static bool inject_emulated_exception(struct x86_emulate_ctxt *ctxt)
{
- struct x86_emulate_ctxt *ctxt = &vcpu->arch.emulate_ctxt;
+ struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
+
if (ctxt->exception.vector == PF_VECTOR)
return kvm_propagate_fault(vcpu, &ctxt->exception);
@@ -6718,7 +6719,7 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu,
*/
WARN_ON_ONCE(ctxt->exception.vector == UD_VECTOR ||
exception_type(ctxt->exception.vector) == EXCPT_TRAP);
- inject_emulated_exception(vcpu);
+ inject_emulated_exception(ctxt);
return 1;
}
return handle_emulation_failure(vcpu, emulation_type);
@@ -6772,7 +6773,7 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu,
if (ctxt->have_exception) {
r = 1;
- if (inject_emulated_exception(vcpu))
+ if (inject_emulated_exception(ctxt))
return r;
} else if (vcpu->arch.pio.count) {
if (!vcpu->arch.pio.in) {
Invert the vcpu->context derivation in inject_emulated_exception() in preparation for dynamically allocating the emulation context. Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> --- arch/x86/kvm/x86.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)