From patchwork Tue Mar 8 05:32:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 8529651 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F1A949F372 for ; Tue, 8 Mar 2016 05:34:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2756D2017E for ; Tue, 8 Mar 2016 05:34:32 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5166D2017D for ; Tue, 8 Mar 2016 05:34:31 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1adAF0-0000N7-Cz; Tue, 08 Mar 2016 05:31:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1adAEy-0000N1-VY for xen-devel@lists.xen.org; Tue, 08 Mar 2016 05:31:29 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id B7/2D-03098-0B36ED65; Tue, 08 Mar 2016 05:31:28 +0000 X-Env-Sender: wency@cn.fujitsu.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1457415086!20070371!1 X-Originating-IP: [59.151.112.132] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35364 invoked from network); 8 Mar 2016 05:31:27 -0000 Received: from unknown (HELO heian.cn.fujitsu.com) (59.151.112.132) by server-16.tower-31.messagelabs.com with SMTP; 8 Mar 2016 05:31:27 -0000 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="4337420" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 08 Mar 2016 13:30:52 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id BE67541890FE; Tue, 8 Mar 2016 13:30:51 +0800 (CST) Received: from [10.167.226.52] (10.167.226.52) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server id 14.3.181.6; Tue, 8 Mar 2016 13:30:51 +0800 From: Wen Congyang To: xen devel , Wei Liu , Andrew Cooper Message-ID: <56DE63D6.5080400@cn.fujitsu.com> Date: Tue, 8 Mar 2016 13:32:06 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 X-Originating-IP: [10.167.226.52] X-yoursite-MailScanner-ID: BE67541890FE.A6408 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: wency@cn.fujitsu.com X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Cc: Ian Jackson , Ian Campbell Subject: [Xen-devel] [PATCH] libxc: move migration_stream's definition to xenguest.h X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP xc_save_domain()'s parameter use this type, so it should be public. Signed-off-by: Wen Congyang --- tools/libxc/include/xenguest.h | 10 ++++++++++ tools/libxc/xc_sr_common.h | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/libxc/include/xenguest.h b/tools/libxc/include/xenguest.h index affc42b..888536e 100644 --- a/tools/libxc/include/xenguest.h +++ b/tools/libxc/include/xenguest.h @@ -238,4 +238,9 @@ xen_pfn_t *xc_map_m2p(xc_interface *xch, unsigned long max_mfn, int prot, unsigned long *mfn0); + +typedef enum { + MIG_STREAM_NONE, /* plain stream */ + MIG_STREAM_REMUS, +} migration_stream; #endif /* XENGUEST_H */ diff --git a/tools/libxc/xc_sr_common.h b/tools/libxc/xc_sr_common.h index 66f595f..e7568b5 100644 --- a/tools/libxc/xc_sr_common.h +++ b/tools/libxc/xc_sr_common.h @@ -180,16 +180,6 @@ struct xc_sr_context xc_dominfo_t dominfo; - /* - * migration stream - * 0: Plain VM - * 1: Remus - */ - enum { - MIG_STREAM_NONE, /* plain stream */ - MIG_STREAM_REMUS, - } migration_stream; - union /* Common save or restore data. */ { struct /* Save data. */