File valgrind.merge-two-xen-domctl-values-for-cleari... of Package valgrind

Overview Repositories Revisions Requests Users Attributes Meta

File valgrind.merge-two-xen-domctl-values-for-clearity.patch of Package valgrind (Revision 255f7eac47e361feb25d6bc73c32fc28)

Currently displaying revision 255f7eac47e361feb25d6bc73c32fc28 , Show latest

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
@@ -1237,8 +1237,7 @@ PRE(domctl)
       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:
@@ -2109,8 +2108,7 @@ POST(domctl){
                         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:

Places

File valgrind.merge-two-xen-domctl-values-for-clearity.patch of Package valgrind (Revision 255f7eac47e361feb25d6bc73c32fc28)

Places