[Xen-changelog] [xen-unstable] mem_event: Revert pointless, unrelated, and broken (on i386) change in 23434:ef410f262299

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1306568034 -3600
# Node ID c15f06b99bbe0498c6fbad8155aec54c593f8ceb
# Parent  ef410f262299d45017c42f36194600a35263404a
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@xxxxxxx>
---


diff -r ef410f262299 -r c15f06b99bbe xen/arch/x86/hvm/hvm.c
--- a/xen/arch/x86/hvm/hvm.c    Fri May 27 18:44:26 2011 +0100
+++ b/xen/arch/x86/hvm/hvm.c    Sat May 28 08:33:54 2011 +0100
@@ -4068,21 +4068,11 @@
             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;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog