From: Zhenzhong Duan <zhenzhong.duan@oracle.com>
Date: Wed, 19 Sep 2012 15:38:47 +0000 (+0200)
Subject: tmem: bump pool version to 1 to fix restore issue when tmem enabled
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7875
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=367f6be33cfd9e6c91410c7d60ce0c0c7c44723f;p=xen.git

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>
---

diff --git a/xen/common/tmem.c b/xen/common/tmem.c
index f4812b911c..ed322b68de 100644
--- a/xen/common/tmem.c
+++ b/xen/common/tmem.c
@@ -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 )