From: Keir Fraser <keir@xen.org>
Date: Sat, 28 May 2011 07:33:54 +0000 (+0100)
Subject: mem_event: Revert pointless, unrelated, and broken (on i386) change in 23434:ef410f262299
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~10265
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d708419403afa9cae91f21f287b32acf4f4c3b17;p=xen.git

mem_event: Revert pointless, unrelated, and broken (on i386) change in 23434:ef410f262299

vcpu_pause() is nestable in the hypervisor, hence checking for
already-paused is not required.

Signed-off-by: Keir Fraser <keir@xen.org>
---

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index aa283cc1a5..9883c3fb7d 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -4068,21 +4068,11 @@ int hvm_debug_op(struct vcpu *v, int32_t op)
             rc = -ENOSYS;
             if ( !cpu_has_monitor_trap_flag )
                 break;
-
-            rc = mem_event_check_ring(v->domain);
-            /* rc ==0 p2m_mem_access_check() has already paused the vcpu */
-            if ( rc < 0 )
-                vcpu_pause(v);
-
+            rc = 0;
+            vcpu_pause(v);
             v->arch.hvm_vcpu.single_step =
                 (op == XEN_DOMCTL_DEBUG_OP_SINGLE_STEP_ON);
-
-            /* rc ==0 p2m_mem_access_resume() will unpause the vcpu */
-            if ( rc < 0 )
-            {
-                vcpu_unpause(v); /* guest will latch new state */
-                rc = 0;
-            }
+            vcpu_unpause(v); /* guest will latch new state */
             break;
         default:
             rc = -ENOSYS;