From patchwork Wed Mar 9 08:46:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 8544081 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1A8FFC0553 for ; Wed, 9 Mar 2016 08:48:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 468AF2021A for ; Wed, 9 Mar 2016 08:48:47 +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 77B5820211 for ; Wed, 9 Mar 2016 08:48:46 +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 1adZka-0004Fd-OU; Wed, 09 Mar 2016 08:45:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1adZkZ-0004FX-6s for xen-devel@lists.xen.org; Wed, 09 Mar 2016 08:45:47 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id D9/66-15842-AB2EFD65; Wed, 09 Mar 2016 08:45:46 +0000 X-Env-Sender: wency@cn.fujitsu.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1457513140!10556808!2 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 3755 invoked from network); 9 Mar 2016 08:45:44 -0000 Received: from cn.fujitsu.com (HELO heian.cn.fujitsu.com) (59.151.112.132) by server-10.tower-206.messagelabs.com with SMTP; 9 Mar 2016 08:45:44 -0000 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="4387630" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 09 Mar 2016 16:45:27 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id 121C642B55E3; Wed, 9 Mar 2016 16:45:26 +0800 (CST) Received: from G08FNSTD140052.g08.fujitsu.local (10.167.226.52) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Wed, 9 Mar 2016 16:45:25 +0800 From: Wen Congyang To: xen devel , Andrew Cooper , Wei Liu Date: Wed, 9 Mar 2016 16:46:36 +0800 Message-ID: <1457513197-21022-1-git-send-email-wency@cn.fujitsu.com> X-Mailer: git-send-email 2.5.0 MIME-Version: 1.0 X-Originating-IP: [10.167.226.52] X-yoursite-MailScanner-ID: 121C642B55E3.A8AE5 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 , Wen Congyang Subject: [Xen-devel] [PATCH v2 1/2] 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_domain_save() and xc_domain_restore's parameter will use this type, so it should be public. Signed-off-by: Wen Congyang --- tools/libxc/include/xenguest.h | 5 +++++ tools/libxc/xc_sr_common.h | 10 ---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/tools/libxc/include/xenguest.h b/tools/libxc/include/xenguest.h index affc42b..973e5a6 100644 --- a/tools/libxc/include/xenguest.h +++ b/tools/libxc/include/xenguest.h @@ -75,6 +75,11 @@ struct save_callbacks { void* data; }; +typedef enum { + MIG_STREAM_NONE, /* plain stream */ + MIG_STREAM_REMUS, +} xc_migration_stream_t; + /** * This function will save a running domain. * 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. */