[12/16] x86/vm-event: fix: move cleanup of mem_access_emulate_each_rep to monitor stub

Commit Message

Corneliu ZUZU July 9, 2016, 4:20 a.m. UTC

Move cleanup of mem_access_emulate_each_rep to monitor_cleanup_domain() as the
field is part of the monitor subsystem's resources.

Signed-off-by: Corneliu ZUZU <[e-mail]>
---
 xen/arch/x86/monitor.c  | 3 +++
 xen/arch/x86/vm_event.c | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

Patch

diff --git a/xen/arch/x86/monitor.c b/xen/arch/x86/monitor.c
index 4a29cad..c558f46 100644
--- a/xen/arch/x86/monitor.c
+++ b/xen/arch/x86/monitor.c
@@ -80,6 +80,9 @@  void monitor_cleanup_domain(struct domain *d)
 
     memset(&d->arch.monitor, 0, sizeof(d->arch.monitor));
     memset(&d->monitor, 0, sizeof(d->monitor));
+
+    d->arch.mem_access_emulate_each_rep = 0;
+
     d->monitor.initialised = 0;
 }
 
diff --git a/xen/arch/x86/vm_event.c b/xen/arch/x86/vm_event.c
index bb9c0a0..e2b258b 100644
--- a/xen/arch/x86/vm_event.c
+++ b/xen/arch/x86/vm_event.c
@@ -68,8 +68,6 @@  void vm_event_cleanup_domain(struct domain *d, struct vm_event_domain *ved)
     /* Per-vcpu uninitializations. */
     for_each_vcpu ( d, v )
         vm_event_cleanup_vcpu_destroy(v);
-
-    d->arch.mem_access_emulate_each_rep = 0;
 }
 
 void vm_event_toggle_singlestep(struct domain *d, struct vcpu *v)