File valgrind.xen-3.0-versioned-xen_domctl_settimeof... of Package valgrind

Overview Repositories Revisions Requests Users Attributes Meta

File valgrind.xen-3.0-versioned-xen_domctl_settimeoffset.patch of Package valgrind

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

Rename settimeoffset to represent layout from dawn of time up to xen-4.5.

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

--- a/coregrind/m_syswrap/syswrap-xen.c
+++ b/coregrind/m_syswrap/syswrap-xen.c
@@ -1057,26 +1057,33 @@ PRE(domctl)
 
    case VKI_XEN_DOMCTL_ioport_permission:
       PRE_XEN_DOMCTL_READ(ioport_permission, first_port);
       PRE_XEN_DOMCTL_READ(ioport_permission, nr_ports);
       PRE_XEN_DOMCTL_READ(ioport_permission, allow_access);
       break;
 
    case VKI_XEN_DOMCTL_hypercall_init:
       PRE_XEN_DOMCTL_READ(hypercall_init, gmfn);
       break;
 
    case VKI_XEN_DOMCTL_settimeoffset:
-       PRE_XEN_DOMCTL_READ(settimeoffset, time_offset_seconds);
-       break;
+      switch (domctl->interface_version) {
+      case 0x00000007:
+      case 0x00000008:
+      case 0x00000009:
+      case 0x0000000a:
+         PRE_XEN_DOMCTL_READ(settimeoffset_00000001, time_offset_seconds);
+         break;
+      }
+      break;
 
    case VKI_XEN_DOMCTL_getvcpuinfo:
       PRE_XEN_DOMCTL_READ(getvcpuinfo, vcpu);
       break;
 
    case VKI_XEN_DOMCTL_scheduler_op:
       PRE_XEN_DOMCTL_READ(scheduler_op, sched_id);
       PRE_XEN_DOMCTL_READ(scheduler_op, cmd);
       if ( domctl->u.scheduler_op.cmd == VKI_XEN_DOMCTL_SCHEDOP_putinfo ) {
          switch(domctl->u.scheduler_op.sched_id) {
          case VKI_XEN_SCHEDULER_SEDF:
             PRE_XEN_DOMCTL_READ(scheduler_op, u.sedf.period);
--- a/include/vki/vki-xen-domctl.h
+++ b/include/vki/vki-xen-domctl.h
@@ -352,25 +352,25 @@ struct vki_xen_domctl_iomem_permission {
 };
 
 struct vki_xen_domctl_ioport_permission {
     vki_uint32_t first_port;              /* IN */
     vki_uint32_t nr_ports;                /* IN */
     vki_uint8_t  allow_access;            /* IN */
 };
 
 struct vki_xen_domctl_hypercall_init {
     vki_xen_uint64_aligned_t  gmfn;           /* GMFN to be initialised */
 };
 
-struct vki_xen_domctl_settimeoffset {
+struct vki_xen_domctl_settimeoffset_00000001 {
     vki_int32_t time_offset_seconds;
 };
 
 struct vki_xen_domctl_cpuid {
   vki_uint32_t input[2];
   vki_uint32_t eax;
   vki_uint32_t ebx;
   vki_uint32_t ecx;
   vki_uint32_t edx;
 };
 
 struct vki_xen_guest_tsc_info {
@@ -678,25 +678,25 @@ struct vki_xen_domctl {
         struct vki_xen_domctl_max_mem           max_mem;
         struct vki_xen_domctl_vcpucontext       vcpucontext;
         struct vki_xen_domctl_getvcpuinfo       getvcpuinfo;
         struct vki_xen_domctl_max_vcpus         max_vcpus;
         struct vki_xen_domctl_scheduler_op      scheduler_op;
         //struct vki_xen_domctl_setdomainhandle   setdomainhandle;
         //struct vki_xen_domctl_setdebugging      setdebugging;
         struct vki_xen_domctl_irq_permission    irq_permission;
         struct vki_xen_domctl_iomem_permission  iomem_permission;
         struct vki_xen_domctl_ioport_permission ioport_permission;
         struct vki_xen_domctl_hypercall_init    hypercall_init;
         //struct vki_xen_domctl_arch_setup        arch_setup;
-        struct vki_xen_domctl_settimeoffset     settimeoffset;
+        struct vki_xen_domctl_settimeoffset_00000001     settimeoffset_00000001;
         //struct vki_xen_domctl_disable_migrate   disable_migrate;
         struct vki_xen_domctl_tsc_info_00000007   tsc_info_00000007;
         struct vki_xen_domctl_tsc_info_0000000b   tsc_info_0000000b;
         //struct vki_xen_domctl_real_mode_area    real_mode_area;
         struct vki_xen_domctl_hvmcontext        hvmcontext;
         struct vki_xen_domctl_hvmcontext_partial_0000000e hvmcontext_partial_00000007;
         struct vki_xen_domctl_hvmcontext_partial_0000000e hvmcontext_partial_0000000e;
         struct vki_xen_domctl_address_size      address_size;
         //struct vki_xen_domctl_sendtrigger       sendtrigger;
         //struct vki_xen_domctl_get_device_group  get_device_group;
         struct vki_xen_domctl_assign_device_00000007 assign_device_00000007;
         struct vki_xen_domctl_assign_device_0000000b assign_device_0000000b;

Places

File valgrind.xen-3.0-versioned-xen_domctl_settimeoffset.patch of Package valgrind

Places