File valgrind.xen-4.1-handle-XEN_HVMOP_inject_trap.p... of Package valgrind

Overview Repositories Revisions Requests Users Attributes Meta

File valgrind.xen-4.1-handle-XEN_HVMOP_inject_trap.patch of Package valgrind (Revision fb8b3d61b6baabbde536a805ef05aee4)

Currently displaying revision fb8b3d61b6baabbde536a805ef05aee4 , Show latest

From: Olaf Hering <olaf@aepfle.de>
Date: Wed, 26 Feb 2020 16:16:07 +0100
Subject: xen-4.1: handle XEN_HVMOP_inject_trap

bz#390553

Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
 coregrind/m_syswrap/syswrap-xen.c | 8 ++++++++
 include/vki/vki-xen-hvm.h         | 9 +++++++++
 2 files changed, 17 insertions(+)

--- a/coregrind/m_syswrap/syswrap-xen.c
+++ b/coregrind/m_syswrap/syswrap-xen.c
@@ -1485,26 +1485,34 @@ PRE(hvm_op)
 
    case VKI_XEN_HVMOP_get_mem_access:
       PRE_XEN_HVMOP_READ(get_mem_access, domid);
       PRE_XEN_HVMOP_READ(get_mem_access, pfn);
 
       PRE_MEM_WRITE("XEN_HVMOP_get_mem_access *hvmmem_access",
                     (Addr)&(((vki_xen_hvm_get_mem_access_t*)arg)->hvmmem_access),
                     sizeof(vki_uint16_t));
       break;
 
    case VKI_XEN_HVMOP_inject_trap:
       switch (vki_assumed_xenversion) {
+         case vki_xenversion_401:
+         PRE_XEN_HVMOP_READ(inject_trap_0401, domid);
+         PRE_XEN_HVMOP_READ(inject_trap_0401, vcpuid);
+         PRE_XEN_HVMOP_READ(inject_trap_0401, trap);
+         PRE_XEN_HVMOP_READ(inject_trap_0401, error_code);
+         PRE_XEN_HVMOP_READ(inject_trap_0401, cr2);
+         break;
          case vki_xenversion_unset:
             vki_report_unknown_xenversion("VKI_XEN_HVMOP_inject_trap");
+            /* fallthrough */
          case vki_xenversion_402:
          default:
          PRE_XEN_HVMOP_READ(inject_trap_0402, domid);
          PRE_XEN_HVMOP_READ(inject_trap_0402, vcpuid);
          PRE_XEN_HVMOP_READ(inject_trap_0402, vector);
          PRE_XEN_HVMOP_READ(inject_trap_0402, type);
          PRE_XEN_HVMOP_READ(inject_trap_0402, error_code);
          PRE_XEN_HVMOP_READ(inject_trap_0402, insn_len);
          PRE_XEN_HVMOP_READ(inject_trap_0402, cr2);
          break;
       }
       break;
--- a/include/vki/vki-xen-hvm.h
+++ b/include/vki/vki-xen-hvm.h
@@ -86,24 +86,33 @@ struct vki_xen_hvm_set_mem_access {
 };
 typedef struct vki_xen_hvm_set_mem_access vki_xen_hvm_set_mem_access_t;
 
 #define VKI_XEN_HVMOP_get_mem_access        13
 struct vki_xen_hvm_get_mem_access {
     vki_xen_domid_t domid;
     vki_uint16_t hvmmem_access; /* OUT */
     vki_uint64_t pfn;
 };
 typedef struct vki_xen_hvm_get_mem_access vki_xen_hvm_get_mem_access_t;
 
 #define VKI_XEN_HVMOP_inject_trap            14
+struct vki_xen_hvm_inject_trap_0401 {
+    vki_xen_domid_t domid;
+    vki_uint32_t vcpuid;
+    vki_uint32_t trap;
+    vki_uint32_t error_code;
+    vki_uint64_t cr2;
+};
+typedef struct vki_xen_hvm_inject_trap_0401 vki_xen_hvm_inject_trap_0401_t;
+
 struct vki_xen_hvm_inject_trap_0402 {
     vki_xen_domid_t domid;
     vki_uint32_t vcpuid;
     vki_uint32_t vector;
     vki_uint32_t type;
     vki_uint32_t error_code;
     vki_uint32_t insn_len;
     vki_uint64_t cr2;
 };
 typedef struct vki_xen_hvm_inject_trap_0402 vki_xen_hvm_inject_trap_0402_t;
 
 #endif // __VKI_XEN_HVM_H

Places

File valgrind.xen-4.1-handle-XEN_HVMOP_inject_trap.patch of Package valgrind (Revision fb8b3d61b6baabbde536a805ef05aee4)

Places