KVM: Record instruction set in all vmexit tracepoints

The kvm_exit tracepoint recently added the isa argument to aid decoding
exit_reason.  The semantics of exit_reason depend on the instruction set
(vmx or svm) and the isa argument allows traces to be analyzed on other
machines.

Add the isa argument to kvm_nested_vmexit and kvm_nested_vmexit_inject
so these tracepoints can also be self-describing.

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 475d1c948501..6adb7ba13a4a 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -2182,7 +2182,8 @@ static int nested_svm_vmexit(struct vcpu_svm *svm)
                                        vmcb->control.exit_info_1,
                                        vmcb->control.exit_info_2,
                                        vmcb->control.exit_int_info,
-                                       vmcb->control.exit_int_info_err);
+                                       vmcb->control.exit_int_info_err,
+                                       KVM_ISA_SVM);
 
         nested_vmcb = nested_svm_map(svm, svm->nested.vmcb, &page);
         if (!nested_vmcb)
@@ -3335,7 +3336,8 @@ static int handle_exit(struct kvm_vcpu *vcpu)
                                         svm->vmcb->control.exit_info_1,
                                         svm->vmcb->control.exit_info_2,
                                         svm->vmcb->control.exit_int_info,
-                                        svm->vmcb->control.exit_int_info_err);
+                                        svm->vmcb->control.exit_int_info_err,
+                                        KVM_ISA_SVM);
 
                 vmexit = nested_svm_exit_special(svm);