[Xen-changelog] SHADOW_CONTROL_OP_OFF should be checkign whether shadow mode

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 060a6634d9eca3ae9b0e632e2fbfd4b93bfb09e9
# Parent  faf5c318f9b06ba90650436d5842a8009b9ab8fe
SHADOW_CONTROL_OP_OFF should be checkign whether shadow mode
is actually currently enabled.

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r faf5c318f9b0 -r 060a6634d9ec xen/arch/x86/shadow32.c
--- a/xen/arch/x86/shadow32.c   Tue Nov 22 06:08:57 2005
+++ b/xen/arch/x86/shadow32.c   Tue Nov 22 10:53:45 2005
@@ -1381,8 +1381,11 @@
     switch ( op )
     {
     case DOM0_SHADOW_CONTROL_OP_OFF:
-        __shadow_sync_all(d);
-        __shadow_mode_disable(d);
+        if ( shadow_mode_enabled(d) )
+        {
+            __shadow_sync_all(d);
+            __shadow_mode_disable(d);
+        }
         break;
 
     case DOM0_SHADOW_CONTROL_OP_ENABLE_TEST:
diff -r faf5c318f9b0 -r 060a6634d9ec xen/arch/x86/shadow_public.c
--- a/xen/arch/x86/shadow_public.c      Tue Nov 22 06:08:57 2005
+++ b/xen/arch/x86/shadow_public.c      Tue Nov 22 10:53:45 2005
@@ -1290,8 +1290,11 @@
     switch ( op )
     {
     case DOM0_SHADOW_CONTROL_OP_OFF:
-        __shadow_sync_all(d);
-        __shadow_mode_disable(d);
+        if ( shadow_mode_enabled(d) )
+        {
+            __shadow_sync_all(d);
+            __shadow_mode_disable(d);
+        }
         break;
 
     case DOM0_SHADOW_CONTROL_OP_ENABLE_TEST:

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