@@ -1312,10 +1312,12 @@ CHECK_FIELD_(struct, mc_fetch, fetch_id)
CHECK_FIELD_(struct, mc_physcpuinfo, ncpus);
# define CHECK_compat_mc_physcpuinfo struct mc_physcpuinfo
-#define CHECK_compat_mc_inject_v2 struct mc_inject_v2
+# define xen_ctl_bitmap xenctl_bitmap
+
CHECK_mc;
# undef CHECK_compat_mc_fetch
# undef CHECK_compat_mc_physcpuinfo
+# undef xen_ctl_bitmap
# define xen_mc_info mc_info
CHECK_mc_info;
@@ -429,6 +429,7 @@ struct xen_mc_inject_v2 {
uint32_t flags;
xenctl_bitmap_t cpumap;
};
+typedef struct xen_mc_inject_v2 xen_mc_inject_v2_t;
#endif
struct xen_mc {
@@ -441,7 +442,7 @@ struct xen_mc {
xen_mc_msrinject_t mc_msrinject;
xen_mc_mceinject_t mc_mceinject;
#if defined(__XEN__) || defined(__XEN_TOOLS__)
- struct xen_mc_inject_v2 mc_inject_v2;
+ xen_mc_inject_v2_t mc_inject_v2;
#endif
} u;
};
@@ -44,6 +44,7 @@
? mcinfo_recovery arch-x86/xen-mca.h
! mc_fetch arch-x86/xen-mca.h
? mc_info arch-x86/xen-mca.h
+? mc_inject_v2 arch-x86/xen-mca.h
? mc_mceinject arch-x86/xen-mca.h
? mc_msrinject arch-x86/xen-mca.h
? mc_notifydomain arch-x86/xen-mca.h
@@ -19,6 +19,7 @@ pats = [
[ r"(^|[^\w])xen_?(\w*)_compat_t([^\w]|$$)", r"\1compat_\2_t\3" ],
[ r"(^|[^\w])XEN_?", r"\1COMPAT_" ],
[ r"(^|[^\w])Xen_?", r"\1Compat_" ],
+ [ r"(^|[^\w])COMPAT_HANDLE_64\(", r"\1XEN_GUEST_HANDLE_64(" ],
[ r"(^|[^\w])long([^\w]|$$)", r"\1int\2" ]
];
@@ -10,7 +10,7 @@ pats = [
[ r"^\s*#\s*define\s+([A-Z_]*_GUEST_HANDLE)", r"#define HIDE_\1" ],
[ r"^\s*#\s*define\s+([a-z_]*_guest_handle)", r"#define hide_\1" ],
[ r"^\s*#\s*define\s+(u?int64)_aligned_t\s.*aligned.*", r"typedef \1_T __attribute__((aligned(4))) \1_compat_T;" ],
- [ r"XEN_GUEST_HANDLE(_[0-9A-Fa-f]+)?", r"COMPAT_HANDLE" ],
+ [ r"XEN_GUEST_HANDLE", r"COMPAT_HANDLE" ],
];
xlatf = open('xlat.lst', 'r')