[Xen-changelog] [xen-3.2-testing] 32-on-64: Fix error handling for XENMEM_decrease_reservation.

["Xen patchbot-3.2-testing" <patchbot-3.2-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1213361962 -3600
# Node ID b39b6ab402ee28b71d0b78e92f897f38e1583e89
# Parent  d31315b23f286ee8e6d2edd523d53a876a95d3fb
32-on-64: Fix error handling for XENMEM_decrease_reservation.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
xen-unstable changeset:   17852:12ae02c09d1e9f0cd7153f256618dcc544420d54
xen-unstable date:        Fri Jun 13 13:47:28 2008 +0100
---
 xen/common/compat/memory.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff -r d31315b23f28 -r b39b6ab402ee xen/common/compat/memory.c
--- a/xen/common/compat/memory.c        Thu Jun 12 18:31:19 2008 +0100
+++ b/xen/common/compat/memory.c        Fri Jun 13 13:59:22 2008 +0100
@@ -250,7 +250,7 @@ int compat_memory_op(unsigned int cmd, X
         case XENMEM_decrease_reservation:
         case XENMEM_populate_physmap:
             end_extent = split >= 0 ? rc : cmd >> MEMOP_EXTENT_SHIFT;
-            if ( op != XENMEM_decrease_reservation &&
+            if ( (op != XENMEM_decrease_reservation) &&
                  !guest_handle_is_null(nat.rsrv->extent_start) )
             {
                 for ( ; start_extent < end_extent; ++start_extent )
@@ -276,13 +276,14 @@ int compat_memory_op(unsigned int cmd, X
                         break;
                     }
                 }
-
-                /* Bail if there was an error. */
-                if ( (split >= 0) && (end_extent != nat.rsrv->nr_extents) )
-                    split = 0;
             }
             else
+            {
                 start_extent = end_extent;
+            }
+            /* Bail if there was an error. */
+            if ( (split >= 0) && (end_extent != nat.rsrv->nr_extents) )
+                split = 0;
             break;
 
         case XENMEM_exchange:

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