From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dan Magenheimer <dan.magenheimer@oracle.com>
Subject: Re: Bump tmem pool version to 1 to fix restore issue
 when tmem enabled
Date: Wed, 19 Sep 2012 08:20:46 -0700 (PDT)
Message-ID: <ca12f838-7419-4ab0-9ad5-2f9bd8978773@default>
References: <2c58eb85-429e-4dc6-942b-f59414a6b399@default>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <2c58eb85-429e-4dc6-942b-f59414a6b399@default>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Zhenzhong Duan <zhenzhong.duan@oracle.com>, xen-devel@lists.xen.org
Cc: Joe Jin <joe.jin@oracle.com>, JBeulich@suse.com, Konrad Wilk <konrad.wilk@oracle.com>
List-Id: xen-devel@lists.xenproject.org

> From: Zhenzhong Duan
> Sent: Tuesday, September 18, 2012 9:07 PM
> To: xen-devel@lists.xen.org
> Cc: Konrad Wilk; Dan Magenheimer; Feng Jin; JBeulich@suse.com
> Subject: Bump tmem pool version to 1 to fix restore issue when tmem enabled
> 
> Restore fail when tmem enabled both in hypervisor and guest.
> This is due to spec version mismatch when restore a pool.
> 
> Signed-off-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>

Thanks zduan!

I think this fix makes tmem fully functional again on xen-unstable.

Acked-by: Dan Magenheimer <dan.magenheimer@oracle.com>

> ---
> diff -r d1c3375c3f11 xen/common/tmem.c
> --- a/xen/common/tmem.c Mon Sep 17 21:12:21 2012 +0100
> +++ b/xen/common/tmem.c Wed Sep 19 10:28:05 2012 +0800
> @@ -2397,7 +2397,8 @@
>               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 )
>