27 lines
1.0 KiB
Diff
27 lines
1.0 KiB
Diff
|
# HG changeset patch
|
||
|
|
# User Zhenzhong Duan <zhenzhong.duan@oracle.com>
|
||
|
|
# 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@oracle.com>
|
||
|
|
Acked-by: Dan Magenheimer <dan.magenheimer@oracle.com>
|
||
|
|
Committed-by: Jan Beulich <jbeulich@suse.com>
|
||
|
|
|
||
|
|
--- a/xen/common/tmem.c
|
||
|
|
+++ b/xen/common/tmem.c
|
||
|
|
@@ -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 )
|