From patchwork Fri Jan 29 05:27:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 8159371 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 853C09F440 for ; Fri, 29 Jan 2016 05:30:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 86A7220138 for ; Fri, 29 Jan 2016 05:30:42 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6A8112012E for ; Fri, 29 Jan 2016 05:30:41 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aP1aq-0007dw-Lt; Fri, 29 Jan 2016 05:27:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aP1ap-0007d8-9D for xen-devel@lists.xen.org; Fri, 29 Jan 2016 05:27:35 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id F4/4C-09708-648FAA65; Fri, 29 Jan 2016 05:27:34 +0000 X-Env-Sender: wency@cn.fujitsu.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1454045251!12793739!1 X-Originating-IP: [59.151.112.132] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27777 invoked from network); 29 Jan 2016 05:27:33 -0000 Received: from cn.fujitsu.com (HELO heian.cn.fujitsu.com) (59.151.112.132) by server-5.tower-21.messagelabs.com with SMTP; 29 Jan 2016 05:27:33 -0000 X-IronPort-AV: E=Sophos;i="5.20,346,1444665600"; d="scan'208";a="3106341" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 29 Jan 2016 13:27:31 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id 2FF60418AD4E; Fri, 29 Jan 2016 13:26:37 +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; Fri, 29 Jan 2016 13:27:12 +0800 From: Wen Congyang To: xen devel , Konrad Rzeszutek Wilk , Andrew Cooper , Ian Campbell , Ian Jackson , Wei Liu Date: Fri, 29 Jan 2016 13:27:31 +0800 Message-ID: <1454045254-3711-16-git-send-email-wency@cn.fujitsu.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1454045254-3711-1-git-send-email-wency@cn.fujitsu.com> References: <1454045254-3711-1-git-send-email-wency@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.52] X-yoursite-MailScanner-ID: 2FF60418AD4E.A98BC X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: wency@cn.fujitsu.com X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Cc: Lars Kurth , Changlong Xie , Wen Congyang , Gui Jianfeng , Jiang Yunhong , Dong Eddie , Shriram Rajagopalan , Yang Hongyang Subject: [Xen-devel] [PATCH v7 15/18] tools/libxl: adjust the indentation X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is just tidying up after the "tools/libxl: rename remus device to checkpoint device" patch automatic renaming. Signed-off-by: Yang Hongyang Signed-off-by: Wen Congyang Acked-by: Ian Campbell Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Wei Liu --- tools/libxl/libxl_checkpoint_device.c | 21 +++++++++++---------- tools/libxl/libxl_internal.h | 19 +++++++++++-------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/tools/libxl/libxl_checkpoint_device.c b/tools/libxl/libxl_checkpoint_device.c index 109cd23..226f159 100644 --- a/tools/libxl/libxl_checkpoint_device.c +++ b/tools/libxl/libxl_checkpoint_device.c @@ -73,9 +73,9 @@ static void devices_teardown_cb(libxl__egc *egc, /* checkpoint device setup and teardown */ static libxl__checkpoint_device* checkpoint_device_init(libxl__egc *egc, - libxl__checkpoint_devices_state *cds, - libxl__device_kind kind, - void *libxl_dev) + libxl__checkpoint_devices_state *cds, + libxl__device_kind kind, + void *libxl_dev) { libxl__checkpoint_device *dev = NULL; @@ -89,9 +89,10 @@ static libxl__checkpoint_device* checkpoint_device_init(libxl__egc *egc, } static void checkpoint_devices_setup(libxl__egc *egc, - libxl__checkpoint_devices_state *cds); + libxl__checkpoint_devices_state *cds); -void libxl__checkpoint_devices_setup(libxl__egc *egc, libxl__checkpoint_devices_state *cds) +void libxl__checkpoint_devices_setup(libxl__egc *egc, + libxl__checkpoint_devices_state *cds) { int i, rc; @@ -137,7 +138,7 @@ out: } static void checkpoint_devices_setup(libxl__egc *egc, - libxl__checkpoint_devices_state *cds) + libxl__checkpoint_devices_state *cds) { int i, rc; @@ -285,12 +286,12 @@ static void devices_checkpoint_cb(libxl__egc *egc, /* API implementations */ -#define define_checkpoint_api(api) \ -void libxl__checkpoint_devices_##api(libxl__egc *egc, \ - libxl__checkpoint_devices_state *cds) \ +#define define_checkpoint_api(api) \ +void libxl__checkpoint_devices_##api(libxl__egc *egc, \ + libxl__checkpoint_devices_state *cds) \ { \ int i; \ - libxl__checkpoint_device *dev; \ + libxl__checkpoint_device *dev; \ \ STATE_AO_GC(cds->ao); \ \ diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 0380408..0f2c96b 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2820,7 +2820,8 @@ typedef struct libxl__save_helper_state { * Each device type needs to implement the interfaces specified in * the libxl__checkpoint_device_instance_ops if it wishes to support Remus. * - * The high-level control flow through the checkpoint device layer is shown below: + * The high-level control flow through the checkpoint device layer is shown + * below: * * xl remus * |-> libxl_domain_remus_start @@ -2881,7 +2882,8 @@ int init_subkind_drbd_disk(libxl__checkpoint_devices_state *cds); void cleanup_subkind_drbd_disk(libxl__checkpoint_devices_state *cds); typedef void libxl__checkpoint_callback(libxl__egc *, - libxl__checkpoint_devices_state *, int rc); + libxl__checkpoint_devices_state *, + int rc); /* * State associated with a checkpoint invocation, including parameters @@ -2889,7 +2891,7 @@ typedef void libxl__checkpoint_callback(libxl__egc *, * save/restore machinery. */ struct libxl__checkpoint_devices_state { - /*---- must be set by caller of libxl__checkpoint_device_(setup|teardown) ----*/ + /*-- must be set by caller of libxl__checkpoint_device_(setup|teardown) --*/ libxl__ao *ao; uint32_t domid; @@ -2902,7 +2904,8 @@ struct libxl__checkpoint_devices_state { /* * this array is allocated before setup the checkpoint devices by the * checkpoint abstract layer. - * devs may be NULL, means there's no checkpoint devices that has been set up. + * devs may be NULL, means there's no checkpoint devices that has been + * set up. * the size of this array is 'num_devices', which is the total number * of libxl nic devices and disk devices(num_nics + num_disks). */ @@ -2964,13 +2967,13 @@ struct libxl__checkpoint_device { _hidden void libxl__checkpoint_devices_setup(libxl__egc *egc, libxl__checkpoint_devices_state *cds); _hidden void libxl__checkpoint_devices_teardown(libxl__egc *egc, - libxl__checkpoint_devices_state *cds); + libxl__checkpoint_devices_state *cds); _hidden void libxl__checkpoint_devices_postsuspend(libxl__egc *egc, - libxl__checkpoint_devices_state *cds); + libxl__checkpoint_devices_state *cds); _hidden void libxl__checkpoint_devices_preresume(libxl__egc *egc, - libxl__checkpoint_devices_state *cds); + libxl__checkpoint_devices_state *cds); _hidden void libxl__checkpoint_devices_commit(libxl__egc *egc, - libxl__checkpoint_devices_state *cds); + libxl__checkpoint_devices_state *cds); _hidden int libxl__netbuffer_enabled(libxl__gc *gc); /*----- Legacy conversion helper -----*/