From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <ian.campbell@citrix.com>
Subject: Re: [PATCH v7 09/10] libxc: add
 XC_DEVICE_MODEL_SAVE_FILE
Date: Tue, 2 Jun 2015 16:12:41 +0100
Message-ID: <1433257961.15036.314.camel@citrix.com>
References: <1432740346-7887-1-git-send-email-vkuznets@redhat.com>
	<1432740346-7887-10-git-send-email-vkuznets@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta5.messagelabs.com ([195.245.231.135])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <prvs=588c3513d=Ian.Campbell@citrix.com>)
	id 1YznuL-0000Hx-M0
	for xen-devel@lists.xenproject.org; Tue, 02 Jun 2015 15:15:13 +0000
In-Reply-To: <1432740346-7887-10-git-send-email-vkuznets@redhat.com>
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: Vitaly Kuznetsov <vkuznets@redhat.com>
Cc: Wei Liu <wei.liu2@citrix.com>, Andrew Jones <drjones@redhat.com>, Keir Fraser <keir@xen.org>, Stefano Stabellini <stefano.stabellini@eu.citrix.com>, Andrew Cooper <andrew.cooper3@citrix.com>, Julien Grall <julien.grall@linaro.org>, Ian Jackson <ian.jackson@eu.citrix.com>, Olaf Hering <olaf@aepfle.de>, Tim Deegan <tim@xen.org>, David Vrabel <david.vrabel@citrix.com>, Jan Beulich <jbeulich@suse.com>, xen-devel@lists.xenproject.org, Daniel De Graaf <dgdegra@tycho.nsa.gov>
List-Id: xen-devel@lists.xenproject.org

On Wed, 2015-05-27 at 17:25 +0200, Vitaly Kuznetsov wrote:
> Use this in libxl_dm instead of hard-coding.
> 
> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>

This is something of an artefact of the layering weirdness regarding the
DM save/restore (saved by libxl, restored by libxc), but I think there
is no harm having this #define in libxc alongside the other one even if
it is actually (currently) handled by libxl.

Acked-by: Ian Campbell <ian.campbell@citrix.com>

> ---
>  tools/libxc/include/xenguest.h | 1 +
>  tools/libxl/libxl_dm.c         | 2 +-
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/libxc/include/xenguest.h b/tools/libxc/include/xenguest.h
> index c71b423..98b3a37 100644
> --- a/tools/libxc/include/xenguest.h
> +++ b/tools/libxc/include/xenguest.h
> @@ -168,6 +168,7 @@ int xc_soft_reset(xc_interface *xch, uint32_t source_dom,
>  		  unsigned long *console_mfn, domid_t store_domid,
>  		  unsigned long *store_mfn);
>  
> +#define XC_DEVICE_MODEL_SAVE_FILE "/var/lib/xen/qemu-save"
>  #define XC_DEVICE_MODEL_RESTORE_FILE "/var/lib/xen/qemu-resume"
>  
>  /**
> diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
> index 0c6408d..869f4cd 100644
> --- a/tools/libxl/libxl_dm.c
> +++ b/tools/libxl/libxl_dm.c
> @@ -31,7 +31,7 @@ static const char *libxl_tapif_script(libxl__gc *gc)
>  
>  const char *libxl__device_model_savefile(libxl__gc *gc, uint32_t domid)
>  {
> -    return libxl__sprintf(gc, "/var/lib/xen/qemu-save.%d", domid);
> +    return libxl__sprintf(gc, XC_DEVICE_MODEL_SAVE_FILE".%d", domid);
>  }
>  
>  static const char *qemu_xen_path(libxl__gc *gc)