]> xenbits.xensource.com Git - xen.git/commitdiff
tmem: bump pool version to 1 to fix restore issue when tmem enabled
authorZhenzhong Duan <zhenzhong.duan@oracle.com>
Wed, 19 Sep 2012 15:38:47 +0000 (17:38 +0200)
committerZhenzhong Duan <zhenzhong.duan@oracle.com>
Wed, 19 Sep 2012 15:38:47 +0000 (17:38 +0200)
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>
xen/common/tmem.c

index f4812b911c0b153366c381bf7817da44e00f7651..ed322b68dee76573d7ab07714c1bd66aa1602e63 100644 (file)
@@ -2397,7 +2397,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 )