Handle shared info (having different layout for native and compatibility

mode guests) accesses.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

1 files changed, 54 insertions, 0 deletions

diff --git a/xen/include/xen/shared.h b/xen/include/xen/shared.h
new file mode 100644
index 0000000000..ee0510cf67
--- /dev/null
+++ b/xen/include/xen/shared.h
@@ -0,0 +1,54 @@
+#ifndef __XEN_SHARED_H__
+#define __XEN_SHARED_H__
+
+#include <xen/config.h>
+
+#ifdef CONFIG_COMPAT
+
+#include <compat/xen.h>
+
+typedef union {
+    struct shared_info native;
+    struct compat_shared_info compat;
+} shared_info_t;
+
+#define __shared_info(d, s, field)      (*(!IS_COMPAT(d) ? \
+                                           &(s)->native.field : \
+                                           &(s)->compat.field))
+#define __shared_info_addr(d, s, field) (!IS_COMPAT(d) ? \
+                                         (void *)&(s)->native.field : \
+                                         (void *)&(s)->compat.field)
+
+#define shared_info(d, field)      __shared_info(d, (d)->shared_info, field)
+#define shared_info_addr(d, field) __shared_info_addr(d, (d)->shared_info, field)
+
+typedef union {
+    struct vcpu_info native;
+    struct compat_vcpu_info compat;
+} vcpu_info_t;
+
+#define vcpu_info(v, field)      (*(!IS_COMPAT((v)->domain) ? \
+                                    &(v)->vcpu_info->native.field : \
+                                    &(v)->vcpu_info->compat.field))
+#define vcpu_info_addr(v, field) (!IS_COMPAT((v)->domain) ? \
+                                  (void *)&(v)->vcpu_info->native.field : \
+                                  (void *)&(v)->vcpu_info->compat.field)
+
+#else
+
+typedef struct shared_info shared_info_t;
+
+#define __shared_info(d, s, field)      ((s)->field)
+#define __shared_info_addr(d, s, field) ((void *)&(s)->field)
+
+#define shared_info(d, field)           ((d)->shared_info->field)
+#define shared_info_addr(d, field)      ((void *)&(d)->shared_info->field)
+
+typedef struct vcpu_info vcpu_info_t;
+
+#define vcpu_info(v, field)             ((v)->vcpu_info->field)
+#define vcpu_info_addr(v, field)        ((void *)&(v)->vcpu_info->field)
+
+#endif
+
+#endif /* __XEN_SHARED_H__ */