[Xen-changelog] [xen-unstable] x86/shadow: unconditionally set the p2m/log-dirty allocation functions.

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxx>
# Date 1297849685 0
# Node ID 2e70ed5e7f518a965a5075d9436ed5a835913a3c
# Parent  86000076dcee7abc6b300ceb28efeee9696d74f6
x86/shadow: unconditionally set the p2m/log-dirty allocation functions.

Otherwise enabling log-dirty mode on a PV guest that already has
a shadow allocation can leave the alloc/free functions pointers NULL,
and later try to dereference them.

Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxx>
---
 xen/arch/x86/mm/shadow/common.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff -r 86000076dcee -r 2e70ed5e7f51 xen/arch/x86/mm/shadow/common.c
--- a/xen/arch/x86/mm/shadow/common.c   Wed Feb 16 09:47:37 2011 +0000
+++ b/xen/arch/x86/mm/shadow/common.c   Wed Feb 16 09:48:05 2011 +0000
@@ -3337,11 +3337,11 @@ static int shadow_one_bit_enable(struct 
             sh_set_allocation(d, 0, NULL);
             return -ENOMEM;
         }
-
-        /* Allow p2m and log-dirty code to borrow shadow memory */
-        d->arch.paging.alloc_page = shadow_alloc_p2m_page;
-        d->arch.paging.free_page = shadow_free_p2m_page;
-    }
+    }
+
+    /* Allow p2m and log-dirty code to borrow shadow memory */
+    d->arch.paging.alloc_page = shadow_alloc_p2m_page;
+    d->arch.paging.free_page = shadow_free_p2m_page;
 
     if ( d->arch.paging.mode == 0 )
     {

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