diff options
author | Zhenzhong Duan <zhenzhong.duan@oracle.com> | 2012-09-25 12:29:29 +0200 |
---|---|---|
committer | Zhenzhong Duan <zhenzhong.duan@oracle.com> | 2012-09-25 12:29:29 +0200 |
commit | 8a26bdc7a41efd6dc0288824bc3fc4cc2fc7ac08 (patch) | |
tree | 9d0dc47e75edb4454b8d819a5d3adbf2c22b2e3b | |
parent | 1eee390a34219eb5a402696ea6b79ce41122c283 (diff) | |
download | xen-8a26bdc7a41efd6dc0288824bc3fc4cc2fc7ac08.tar.gz xen-8a26bdc7a41efd6dc0288824bc3fc4cc2fc7ac08.tar.bz2 xen-8a26bdc7a41efd6dc0288824bc3fc4cc2fc7ac08.zip |
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>
xen-unstable changeset: 25929:fee83ac77d8c
xen-unstable date: Wed Sep 19 15:38:47 UTC 2012
-rw-r--r-- | xen/common/tmem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xen/common/tmem.c b/xen/common/tmem.c index f442e777b4..374f412878 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -2410,7 +2410,8 @@ static NOINLINE int tmemc_save_subop(int cli_id, uint32_t pool_id, 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 ) |