Rename: inslen -> insn_len

Signed-off-by: Keir Fraser <keir@xen.org>

diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c
index 405e619d90219417035244a2600ffef9c22a64d5..812b127ff35911badef9a196b3c9a468515ab074 100644 (file)
--- a/tools/libxc/xc_misc.c
+++ b/tools/libxc/xc_misc.c
@@ -603,7 +603,7 @@ int xc_hvm_get_mem_access(
 
 int xc_hvm_inject_trap(
     xc_interface *xch, domid_t dom, int vcpu, uint32_t vector,
-    uint32_t type, uint32_t error_code, uint32_t inslen,
+    uint32_t type, uint32_t error_code, uint32_t insn_len,
     uint64_t cr2)
 {
     DECLARE_HYPERCALL;
@@ -622,7 +622,7 @@ int xc_hvm_inject_trap(
     arg->vector      = vector;
     arg->type        = type;
     arg->error_code  = error_code;
-    arg->inslen      = inslen;
+    arg->insn_len    = insn_len;
     arg->cr2         = cr2;
 
     hypercall.op     = __HYPERVISOR_hvm_op;

diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h
index fe1431ac1b06a2249a347af05b46d8b208a1b664..15bf8d28cb469b772a3756d0d4be856b253ca307 100644 (file)
--- a/tools/libxc/xenctrl.h
+++ b/tools/libxc/xenctrl.h
@@ -1579,7 +1579,7 @@ int xc_hvm_get_mem_access(
  */
 int xc_hvm_inject_trap(
     xc_interface *xch, domid_t dom, int vcpu, uint32_t vector,
-    uint32_t type, uint32_t error_code, uint32_t inslen,
+    uint32_t type, uint32_t error_code, uint32_t insn_len,
     uint64_t cr2);
 
 /*

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 269deb2e8fec6d6de1fe318c7c58caa32f5e849a..e0d495d88d01dd769b8551dafb722277142765a2 100644 (file)
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -4292,7 +4292,7 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg)
             v->arch.hvm_vcpu.inject_trap.vector = tr.vector;
             v->arch.hvm_vcpu.inject_trap.type = tr.type;
             v->arch.hvm_vcpu.inject_trap.error_code = tr.error_code;
-            v->arch.hvm_vcpu.inject_trap.inslen = tr.inslen;
+            v->arch.hvm_vcpu.inject_trap.insn_len = tr.insn_len;
             v->arch.hvm_vcpu.inject_trap.cr2 = tr.cr2;
         }
 

diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index 79f2b21599d3da249ed46bff06543f490f2e5ff7..ffb86c1d0cba358ed198b1945432a044faa81e1c 100644 (file)
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -1434,7 +1434,7 @@ static void vmx_inject_trap(struct hvm_trap *trap)
     }
 
     if ( _trap.type >= X86_EVENTTYPE_SW_INTERRUPT )
-        __vmwrite(VM_ENTRY_INSTRUCTION_LEN, _trap.inslen);
+        __vmwrite(VM_ENTRY_INSTRUCTION_LEN, _trap.insn_len);
 
     if ( nestedhvm_vcpu_in_guestmode(curr) &&
          nvmx_intercepts_exception(curr, _trap.vector, _trap.error_code) )
@@ -2436,7 +2436,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs)
                         .vector = TRAP_int3,
                         .type = X86_EVENTTYPE_SW_EXCEPTION,
                         .error_code = HVM_DELIVER_NO_ERROR_CODE,
-                        .inslen = __vmread(VM_EXIT_INSTRUCTION_LEN)
+                        .insn_len = __vmread(VM_EXIT_INSTRUCTION_LEN)
                     };
                     hvm_inject_trap(&trap);
                     break;

diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h
index 3ac0bb44c0f451ede4f8aa75e8192139a88b7d5e..ee1677be07229450637affed3e9e296b303f10a5 100644 (file)
--- a/xen/include/asm-x86/hvm/hvm.h
+++ b/xen/include/asm-x86/hvm/hvm.h
@@ -75,7 +75,7 @@ struct hvm_trap {
     int           vector;
     unsigned int  type;         /* X86_EVENTTYPE_* */
     int           error_code;   /* HVM_DELIVER_NO_ERROR_CODE if n/a */
-    int           inslen;       /* Instruction length */ 
+    int           insn_len;     /* Instruction length */ 
     unsigned long cr2;          /* Only for TRAP_page_fault h/w exception */
 };
 

diff --git a/xen/include/public/hvm/hvm_op.h b/xen/include/public/hvm/hvm_op.h
index dbaf5ce6ac31df9750470bff628fc16dd07864af..a9aab4bc3573f63c8af56c230133ce63dc8b52b3 100644 (file)
--- a/xen/include/public/hvm/hvm_op.h
+++ b/xen/include/public/hvm/hvm_op.h
@@ -231,7 +231,7 @@ struct xen_hvm_inject_trap {
     /* Error code, or ~0u to skip */
     uint32_t error_code;
     /* Intruction length */
-    uint32_t inslen;
+    uint32_t insn_len;
     /* CR2 for page faults */
     uint64_aligned_t cr2;
 };