[Xen-changelog] [xen-unstable] Revert 20954:b4041e7bbe1b "paging_domctl: Add missing breaks in switch stmt"

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1267204190 0
# Node ID c4301c2c727dc996ada3656c9105caeab92d9bdb
# Parent  6aa9fb913044621cf6d8de4f0978bd45e5046ada
Revert 20954:b4041e7bbe1b "paging_domctl: Add missing breaks in switch stmt"

This fixed a fairly innocuous bug (OP_ENABLE/OP_OFF both don't work
properly) but unmasked a much nastier one (turning off shadow mode on
a PV guest crashes the hypervisor).

So, for now, we pick the less of two evils. We don't really much rely
on OP_ENABLE/OP_OFF anyway, as it happens.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/mm/paging.c |    2 --
 1 files changed, 2 deletions(-)

diff -r 6aa9fb913044 -r c4301c2c727d xen/arch/x86/mm/paging.c
--- a/xen/arch/x86/mm/paging.c  Fri Feb 26 14:06:16 2010 +0000
+++ b/xen/arch/x86/mm/paging.c  Fri Feb 26 17:09:50 2010 +0000
@@ -714,13 +714,11 @@ int paging_domctl(struct domain *d, xen_
                 hap_logdirty_init(d);
             return paging_log_dirty_enable(d);
         }
-        break;
 
     case XEN_DOMCTL_SHADOW_OP_OFF:
         if ( paging_mode_log_dirty(d) )
             if ( (rc = paging_log_dirty_disable(d)) != 0 )
                 return rc;
-        break;
 
     case XEN_DOMCTL_SHADOW_OP_CLEAN:
     case XEN_DOMCTL_SHADOW_OP_PEEK:

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