File valgrind.Remove-dead-code-from-XEN_DOMCTL_monitor_op.patch of Package valgrind
From: Olaf Hering <olaf@aepfle.de>
Date: Sun, 25 Nov 2018 12:07:43 +0100
Subject: Remove dead code from XEN_DOMCTL_monitor_op
Commit d73f2c748a8c8d0390641b8c893660ec4f9d6935 ("Implement additional
Xen hypercalls") and commit c88133141a354d65568fb85037abc5e1f74ce46b
("Bug 407376 - Update Xen support to 4.12 (4.13, actually) and add more
coverage.") added an op value to the switch list of event.
bz#390553
---
coregrind/m_syswrap/syswrap-xen.c | 4 ----
1 file changed, 4 deletions(-)
--- a/coregrind/m_syswrap/syswrap-xen.c
+++ b/coregrind/m_syswrap/syswrap-xen.c
@@ -1448,46 +1448,42 @@ PRE(domctl)
if (domctl->u.monitor_op_0000000b.op == VKI_XEN_DOMCTL_MONITOR_OP_ENABLE ||
domctl->u.monitor_op_0000000b.op == VKI_XEN_DOMCTL_MONITOR_OP_DISABLE) {
switch (domctl->u.monitor_op_0000000b.event) {
case VKI_XEN_DOMCTL_MONITOR_EVENT_WRITE_CTRLREG:
__PRE_XEN_DOMCTL_READ(monitor_op, monitor_op_0000000b, u.mov_to_cr);
break;
case VKI_XEN_DOMCTL_MONITOR_EVENT_MOV_TO_MSR:
__PRE_XEN_DOMCTL_READ(monitor_op, monitor_op_0000000b, u.mov_to_msr);
break;
case VKI_XEN_DOMCTL_MONITOR_EVENT_GUEST_REQUEST:
__PRE_XEN_DOMCTL_READ(monitor_op, monitor_op_0000000b, u.guest_request);
break;
- case VKI_XEN_DOMCTL_MONITOR_OP_GET_CAPABILITIES:
- break;
}
}
break;
case 0x0000011:
case 0x0000012:
if (domctl->u.monitor_op_00000011.op == VKI_XEN_DOMCTL_MONITOR_OP_ENABLE ||
domctl->u.monitor_op_00000011.op == VKI_XEN_DOMCTL_MONITOR_OP_DISABLE) {
switch (domctl->u.monitor_op_00000011.event) {
case VKI_XEN_DOMCTL_MONITOR_EVENT_WRITE_CTRLREG:
__PRE_XEN_DOMCTL_READ(monitor_op, monitor_op_00000011, u.mov_to_cr);
break;
case VKI_XEN_DOMCTL_MONITOR_EVENT_MOV_TO_MSR:
__PRE_XEN_DOMCTL_READ(monitor_op, monitor_op_00000011, u.mov_to_msr);
break;
case VKI_XEN_DOMCTL_MONITOR_EVENT_GUEST_REQUEST:
__PRE_XEN_DOMCTL_READ(monitor_op, monitor_op_00000011, u.guest_request);
break;
- case VKI_XEN_DOMCTL_MONITOR_OP_GET_CAPABILITIES:
- break;
}
}
break;
}
break;
default:
bad_subop(tid, layout, arrghs, status, flags,
"__HYPERVISOR_domctl", domctl->cmd);
break;
}