[Xen-changelog] [xen-unstable] tmem: bump pool version to 1 to fix restore issue when tmem enabled

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Zhenzhong Duan <zhenzhong.duan@xxxxxxxxxx>
# Date 1348069127 -7200
# Node ID fee83ac77d8c7339abf5185690603ea5b0c548cf
# Parent  7b045d43e59dcb42340097058502bf456e151180
tmem: bump pool version to 1 to fix restore issue when tmem enabled

Restore fails when tmem is enabled both in hypervisor and guest. This
is due to spec version mismatch when restoring a pool.

Signed-off-by: Zhenzhong Duan <zhenzhong.duan@xxxxxxxxxx>
Acked-by: Dan Magenheimer <dan.magenheimer@xxxxxxxxxx>
Committed-by: Jan Beulich <jbeulich@xxxxxxxx>
---


diff -r 7b045d43e59d -r fee83ac77d8c xen/common/tmem.c
--- a/xen/common/tmem.c Wed Sep 19 09:30:50 2012 +0200
+++ b/xen/common/tmem.c Wed Sep 19 17:38:47 2012 +0200
@@ -2397,7 +2397,8 @@ static NOINLINE int tmemc_save_subop(int
              break;
          rc = (pool->persistent ? TMEM_POOL_PERSIST : 0) |
               (pool->shared ? TMEM_POOL_SHARED : 0) |
-              (pool->pageshift << TMEM_POOL_PAGESIZE_SHIFT);
+              (pool->pageshift << TMEM_POOL_PAGESIZE_SHIFT) |
+              (TMEM_SPEC_VERSION << TMEM_POOL_VERSION_SHIFT);
         break;
     case TMEMC_SAVE_GET_POOL_NPAGES:
          if ( pool == NULL )

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