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

[Xen patchbot-4.2-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Zhenzhong Duan <zhenzhong.duan@xxxxxxxxxx>
# Date 1348568373 -7200
# Node ID 2b59edeb0fddf738d055815ab10c2d98ef724be1
# Parent  1853e31bb956699ef0502248a22c21b3aa27efa7
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>
xen-unstable changeset: 25929:fee83ac77d8c
xen-unstable date: Wed Sep 19 15:38:47 UTC 2012
---


diff -r 1853e31bb956 -r 2b59edeb0fdd xen/common/tmem.c
--- a/xen/common/tmem.c Tue Sep 25 12:18:28 2012 +0200
+++ b/xen/common/tmem.c Tue Sep 25 12:19:33 2012 +0200
@@ -2407,7 +2407,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