File valgrind.xen-4.7-versioned-xen_arch_domainconfi... of Package valgrind

Overview Repositories Revisions Requests Users Attributes Meta

File valgrind.xen-4.7-versioned-xen_arch_domainconfig.patch of Package valgrind (Revision a8985a0c820f8bcab2df35b8a19d8b39)

Currently displaying revision a8985a0c820f8bcab2df35b8a19d8b39 , Show latest

From: Olaf Hering <olaf@aepfle.de>
Date: Fri, 23 Nov 2018 15:45:25 +0100
Subject: xen-4.7: versioned xen_arch_domainconfig

New layout in xen-4.7, update xen_domctl_createdomain.
Use value 0x0c as suffix and case, even if this is the domctl value of xen-4.8.
This is because the domctl value was not updated for the release of xen-4.7.
---
 coregrind/m_syswrap/syswrap-xen.c | 12 ++++++++++++
 include/vki/vki-xen-domctl.h      | 23 +++++++++++++++++++++++
 2 files changed, 35 insertions(+)

--- a/coregrind/m_syswrap/syswrap-xen.c
+++ b/coregrind/m_syswrap/syswrap-xen.c
@@ -828,6 +828,18 @@ PRE(domctl)
          __PRE_XEN_DOMCTL_READ(createdomain_0000000b, createdomain_0000000b, config.clock_frequency);
 #endif
          break;
+      case 0x0000000c:
+         PRE_XEN_DOMCTL_READ(createdomain_0000000c, ssidref);
+         PRE_XEN_DOMCTL_READ(createdomain_0000000c, handle);
+         PRE_XEN_DOMCTL_READ(createdomain_0000000c, flags);
+#if defined(__i386__) || defined(__x86_64__)
+         __PRE_XEN_DOMCTL_READ(createdomain_0000000c, createdomain_0000000c, config.emulation_flags);
+#endif
+#if defined(__arm__) || defined(__aarch64__)
+         __PRE_XEN_DOMCTL_READ(createdomain_0000000c, createdomain_0000000c, config.gic_version);
+         __PRE_XEN_DOMCTL_READ(createdomain_0000000c, createdomain_0000000c, config.nr_spis);
+         __PRE_XEN_DOMCTL_READ(createdomain_0000000c, createdomain_0000000c, config.clock_frequency);
+#endif
       }
       break;
 
--- a/include/vki/vki-xen-domctl.h
+++ b/include/vki/vki-xen-domctl.h
@@ -160,6 +160,28 @@ struct vki_xen_domctl_createdomain_0000000b {
     struct vki_xen_arch_domainconfig_0000000b config;
 };
 
+/* The layout changed in 4.07, which shares domctl with 4.06 */
+struct vki_xen_arch_domainconfig_0000000c {
+#if defined(__i386__) || defined(__x86_64__)
+    vki_uint32_t emulation_flags;
+#endif
+#if defined(__arm__) || defined(__aarch64__)
+    /* IN/OUT */
+    vki_uint8_t gic_version;
+    /* IN */
+    vki_uint32_t nr_spis;
+    vki_uint32_t clock_frequency;
+#endif
+};
+
+struct vki_xen_domctl_createdomain_0000000c {
+    /* IN parameters */
+    vki_uint32_t ssidref;
+    vki_xen_domain_handle_t handle;
+    vki_uint32_t flags;
+    struct vki_xen_arch_domainconfig_0000000c config;
+};
+
 struct vki_xen_domctl_getdomaininfo_00000007 {
     /* OUT variables. */
     vki_xen_domid_t  domain;
@@ -615,6 +637,7 @@ struct vki_xen_domctl {
     union {
         struct vki_xen_domctl_createdomain_00000004  createdomain_00000004;
         struct vki_xen_domctl_createdomain_0000000b  createdomain_0000000b;
+        struct vki_xen_domctl_createdomain_0000000c  createdomain_0000000c;
         struct vki_xen_domctl_getdomaininfo_00000007 getdomaininfo_00000007;
         struct vki_xen_domctl_getdomaininfo_00000008 getdomaininfo_00000008;
         struct vki_xen_domctl_getdomaininfo_00000009 getdomaininfo_00000009;

Places

File valgrind.xen-4.7-versioned-xen_arch_domainconfig.patch of Package valgrind (Revision a8985a0c820f8bcab2df35b8a19d8b39)

Places