File valgrind.xen-3.0.4-versioned-xen_domctl_created... of Package valgrind

Overview Repositories Revisions Requests Users Attributes Meta

File valgrind.xen-3.0.4-versioned-xen_domctl_createdomain.patch of Package valgrind (Revision 98defe1bf3ab51da944497cc26a14a15)

Currently displaying revision 98defe1bf3ab51da944497cc26a14a15 , Show latest

From: Olaf Hering <olaf@aepfle.de>
Date: Fri, 16 Nov 2018 17:21:10 +0100
Subject: xen-3.0.4: versioned xen_domctl_createdomain

Rename xen_domctl_createdomain which represents layout from xen-3.0.4 up to xen-4.5.

bz#390553
---
 coregrind/m_syswrap/syswrap-xen.c | 13 ++++++++++---
 include/vki/vki-xen-domctl.h      |  4 ++--
 2 files changed, 12 insertions(+), 5 deletions(-)

--- a/coregrind/m_syswrap/syswrap-xen.c
+++ b/coregrind/m_syswrap/syswrap-xen.c
@@ -757,9 +757,16 @@ PRE(domctl)
       break;
 
    case VKI_XEN_DOMCTL_createdomain:
-      PRE_XEN_DOMCTL_READ(createdomain, ssidref);
-      PRE_XEN_DOMCTL_READ(createdomain, handle);
-      PRE_XEN_DOMCTL_READ(createdomain, flags);
+      switch (domctl->interface_version) {
+      case 0x00000007:
+      case 0x00000008:
+      case 0x00000009:
+      case 0x0000000a:
+         PRE_XEN_DOMCTL_READ(createdomain_00000004, ssidref);
+         PRE_XEN_DOMCTL_READ(createdomain_00000004, handle);
+         PRE_XEN_DOMCTL_READ(createdomain_00000004, flags);
+         break;
+      }
       break;
 
    case VKI_XEN_DOMCTL_gethvmcontext:
--- a/include/vki/vki-xen-domctl.h
+++ b/include/vki/vki-xen-domctl.h
@@ -129,7 +129,7 @@
 #define VKI_XEN_DOMCTL_gdbsx_unpausevcpu           1002
 #define VKI_XEN_DOMCTL_gdbsx_domstatus             1003
 
-struct vki_xen_domctl_createdomain {
+struct vki_xen_domctl_createdomain_00000004 {
     /* IN parameters */
     vki_uint32_t ssidref;
     vki_xen_domain_handle_t handle;
@@ -585,7 +585,7 @@ struct vki_xen_domctl {
     vki_uint32_t interface_version; /* XEN_DOMCTL_INTERFACE_VERSION */
     vki_xen_domid_t  domain;
     union {
-        struct vki_xen_domctl_createdomain      createdomain;
+        struct vki_xen_domctl_createdomain_00000004  createdomain_00000004;
         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-3.0.4-versioned-xen_domctl_createdomain.patch of Package valgrind (Revision 98defe1bf3ab51da944497cc26a14a15)

Places