File valgrind.merge-two-xen-domctl-values-for-clearity.patch of Package valgrind
From: Olaf Hering <olaf@aepfle.de>
Date: Thu, 22 Nov 2018 17:41:07 +0100
Subject: merge two xen domctl values for clearity
A case statement with the same value can not appear twice, so just OR both variants.
bz#390553
---
coregrind/m_syswrap/syswrap-xen.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- a/coregrind/m_syswrap/syswrap-xen.c
+++ b/coregrind/m_syswrap/syswrap-xen.c
@@ -1382,26 +1382,25 @@ PRE(domctl)
PRE_XEN_DOMCTL_READ(set_max_evtchn, max_port);
break;
case VKI_XEN_DOMCTL_cacheflush:
PRE_XEN_DOMCTL_READ(cacheflush, start_pfn);
PRE_XEN_DOMCTL_READ(cacheflush, nr_pfns);
break;
case VKI_XEN_DOMCTL_set_access_required:
PRE_XEN_DOMCTL_READ(access_required, access_required);
break;
- case VKI_XEN_DOMCTL_mem_event_op:
- //case VKI_XEN_DOMCTL_vm_event_op: /* name change in 4.6 */
+ case VKI_XEN_DOMCTL_mem_event_op | VKI_XEN_DOMCTL_vm_event_op:
switch (domctl->interface_version) {
case 0x00000007:
case 0x00000008:
case 0x00000009:
case 0x0000000a:
case 0x0000000b:
case 0x0000000c:
case 0x0000000d:
case 0x0000000e:
case 0x0000000f:
case 0x00000010:
case 0x00000011:
@@ -2395,26 +2394,25 @@ POST(domctl){
default:
break;
}
break;
case VKI_XEN_DOMCTL_get_vcpu_msrs:
if (domctl->u.vcpu_msrs.msrs.p)
POST_MEM_WRITE((Addr)domctl->u.vcpu_msrs.msrs.p,
sizeof(vki_xen_domctl_vcpu_msr_t) *
domctl->u.vcpu_msrs.msr_count);
break;
- case VKI_XEN_DOMCTL_mem_event_op:
- //case VKI_XEN_DOMCTL_vm_event_op: /* name change in 4.6 */
+ case VKI_XEN_DOMCTL_mem_event_op | VKI_XEN_DOMCTL_vm_event_op:
switch (domctl->interface_version) {
case 0x00000007:
case 0x00000008:
case 0x00000009:
case 0x0000000a:
case 0x0000000b:
case 0x0000000c:
case 0x0000000d:
case 0x0000000e:
case 0x0000000f:
case 0x00000010:
case 0x00000011: