From: Ian Campbell <ian.campbell@citrix.com>
To: Yang Hongyang <yanghy@cn.fujitsu.com>
Cc: wei.liu2@citrix.com, wency@cn.fujitsu.com, eddie.dong@intel.com,
yunhong.jiang@intel.com, ian.jackson@eu.citrix.com,
xen-devel@lists.xen.org, rshriram@cs.ubc.ca
Subject: Re: [RFC PATCH COLO v5 11/29] adjust the indentation
Date: Wed, 22 Apr 2015 16:20:12 +0100 [thread overview]
Message-ID: <1429716012.30934.37.camel@citrix.com> (raw)
In-Reply-To: <1427870525-18686-12-git-send-email-yanghy@cn.fujitsu.com>
On Wed, 2015-04-01 at 14:41 +0800, Yang Hongyang wrote:
> From: Wen Congyang <wency@cn.fujitsu.com>
I think this is just tidying up after the previous automatic renaming,
if that is the case please can you say so.
>
> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
> ---
> tools/libxl/libxl_checkpoint_device.c | 23 ++++++++++++-----------
> tools/libxl/libxl_internal.h | 21 ++++++++++++---------
> tools/libxl/libxl_remus.c | 12 ++++++++----
> 3 files changed, 32 insertions(+), 24 deletions(-)
>
> diff --git a/tools/libxl/libxl_checkpoint_device.c b/tools/libxl/libxl_checkpoint_device.c
> index 109cd23..0cfabc3 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;
>
> @@ -223,7 +224,7 @@ static void all_devices_setup_cb(libxl__egc *egc,
> }
>
> void libxl__checkpoint_devices_teardown(libxl__egc *egc,
> - libxl__checkpoint_devices_state *cds)
> + libxl__checkpoint_devices_state *cds)
> {
> int i;
> libxl__checkpoint_device *dev;
> @@ -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 7e7c3b3..4b8590c 100644
> --- a/tools/libxl/libxl_internal.h
> +++ b/tools/libxl/libxl_internal.h
> @@ -2652,7 +2652,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
> @@ -2713,7 +2714,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
> @@ -2721,7 +2723,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;
> @@ -2734,7 +2736,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).
> */
> @@ -2794,15 +2797,15 @@ struct libxl__checkpoint_device {
>
> /* the following 5 APIs are async ops, call cds->callback when done */
> _hidden void libxl__checkpoint_devices_setup(libxl__egc *egc,
> - libxl__checkpoint_devices_state *cds);
> + 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);
>
> /*----- Domain suspend (save) state structure -----*/
> diff --git a/tools/libxl/libxl_remus.c b/tools/libxl/libxl_remus.c
> index 211216c..5afa618 100644
> --- a/tools/libxl/libxl_remus.c
> +++ b/tools/libxl/libxl_remus.c
> @@ -21,9 +21,11 @@
>
> /*----- remus: setup the environment -----*/
> static void libxl__remus_setup_done(libxl__egc *egc,
> - libxl__checkpoint_devices_state *cds, int rc);
> + libxl__checkpoint_devices_state *cds,
> + int rc);
> static void libxl__remus_setup_failed(libxl__egc *egc,
> - libxl__checkpoint_devices_state *cds, int rc);
> + libxl__checkpoint_devices_state *cds,
> + int rc);
>
> void libxl__remus_setup(libxl__egc *egc,
> libxl__domain_suspend_state *dss)
> @@ -57,7 +59,8 @@ out:
> }
>
> static void libxl__remus_setup_done(libxl__egc *egc,
> - libxl__checkpoint_devices_state *cds, int rc)
> + libxl__checkpoint_devices_state *cds,
> + int rc)
> {
> libxl__domain_suspend_state *dss = CONTAINER_OF(cds, *dss, cds);
> STATE_AO_GC(dss->ao);
> @@ -222,7 +225,8 @@ out:
>
> /*----- remus: wait a new checkpoint -----*/
> static void remus_checkpoint_dm_saved(libxl__egc *egc,
> - libxl__domain_suspend_state *dss, int rc);
> + libxl__domain_suspend_state *dss,
> + int rc);
> static void remus_devices_commit_cb(libxl__egc *egc,
> libxl__checkpoint_devices_state *cds,
> int rc);
next prev parent reply other threads:[~2015-04-22 15:20 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-01 6:41 [RFC PATCH COLO v5 00/29] COarse-grain LOck-stepping Virtual Machines for Non-stop Service Yang Hongyang
2015-04-01 6:41 ` [RFC PATCH COLO v5 01/29] Add readme Yang Hongyang
2015-04-08 18:11 ` Wei Liu
2015-04-14 4:06 ` Hongyang Yang
2015-04-01 6:41 ` [RFC PATCH COLO v5 02/29] Refactor domain_suspend_callback_common() Yang Hongyang
2015-04-08 18:11 ` Wei Liu
2015-04-14 5:56 ` Wen Congyang
2015-04-22 14:45 ` Ian Campbell
2015-04-01 6:41 ` [RFC PATCH COLO v5 03/29] tools: libxl: introduce a new API libxl__domain_restore() to read qemu state Yang Hongyang
2015-04-08 18:11 ` Wei Liu
2015-04-15 13:19 ` Ian Jackson
2015-04-01 6:41 ` [RFC PATCH COLO v5 04/29] Update libxl__domain_suspend_common_switch_qemu_logdirty() for colo Yang Hongyang
2015-04-08 18:12 ` Wei Liu
2015-04-01 6:41 ` [RFC PATCH COLO v5 05/29] Introduce a new internal API libxl__domain_unpause() Yang Hongyang
2015-04-08 18:12 ` Wei Liu
2015-04-01 6:41 ` [RFC PATCH COLO v5 06/29] Update libxl__domain_unpause() to support qemu-xen Yang Hongyang
2015-04-08 18:12 ` Wei Liu
2015-04-01 6:41 ` [RFC PATCH COLO v5 07/29] support to resume uncooperative HVM guests Yang Hongyang
2015-04-08 18:12 ` Wei Liu
2015-04-23 12:09 ` Wen Congyang
2015-04-22 14:54 ` Ian Campbell
2015-04-23 12:08 ` Wen Congyang
2015-04-01 6:41 ` [RFC PATCH COLO v5 08/29] tools/libxl: Introduce bitops macros Yang Hongyang
2015-04-22 15:10 ` Ian Campbell
2015-04-23 11:56 ` Wen Congyang
2015-04-01 6:41 ` [RFC PATCH COLO v5 09/29] move remus related codes to libxl_remus.c Yang Hongyang
2015-04-01 6:41 ` [RFC PATCH COLO v5 10/29] rename remus device to checkpoint device Yang Hongyang
2015-04-01 6:41 ` [RFC PATCH COLO v5 11/29] adjust the indentation Yang Hongyang
2015-04-22 15:20 ` Ian Campbell [this message]
2015-04-01 6:41 ` [RFC PATCH COLO v5 12/29] don't touch remus in checkpoint_device Yang Hongyang
2015-04-01 6:41 ` [RFC PATCH COLO v5 13/29] Update libxl_save_msgs_gen.pl to support return data from xl to xc Yang Hongyang
2015-04-01 6:41 ` [RFC PATCH COLO v5 14/29] Allow slave sends data to master Yang Hongyang
2015-04-01 6:41 ` [RFC PATCH COLO v5 15/29] secondary vm suspend/resume/checkpoint code Yang Hongyang
2015-04-01 6:41 ` [RFC PATCH COLO v5 16/29] primary vm suspend/get_dirty_pfn/resume/checkpoint code Yang Hongyang
2015-04-01 6:41 ` [RFC PATCH COLO v5 17/29] xc_domain_save: flush cache before calling callbacks->postcopy() in colo mode Yang Hongyang
2015-04-01 6:41 ` [RFC PATCH COLO v5 18/29] COLO: xc related codes Yang Hongyang
2015-04-01 6:41 ` [RFC PATCH COLO v5 19/29] send store mfn and console mfn to xl before resuming secondary vm Yang Hongyang
2015-04-01 6:41 ` [RFC PATCH COLO v5 20/29] implement the cmdline for COLO Yang Hongyang
2015-04-01 6:41 ` [RFC PATCH COLO v5 21/29] tools: xc_doamin_restore: zero ioreq page only one time Yang Hongyang
2015-04-01 6:55 ` [RFC PATCH COLO v5 22/29] Support colo mode for qemu disk Yang Hongyang
2015-04-01 6:57 ` [RFC PATCH COLO v5 23/29] COLO: use qemu block replication Yang Hongyang
2015-04-01 6:57 ` [RFC PATCH COLO v5 24/29] COLO proxy: implement setup/teardown of COLO proxy module Yang Hongyang
2015-04-01 6:57 ` [RFC PATCH COLO v5 25/29] COLO proxy: preresume, postresume and checkpoint Yang Hongyang
2015-04-01 6:57 ` [RFC PATCH COLO v5 26/29] COLO nic: implement COLO nic subkind Yang Hongyang
2015-04-01 6:58 ` [RFC PATCH COLO v5 27/29] setup and control colo proxy on primary side Yang Hongyang
2015-04-01 6:58 ` [RFC PATCH COLO v5 28/29] setup and control colo proxy on secondary side Yang Hongyang
2015-04-01 6:58 ` [RFC PATCH COLO v5 29/29] cmdline switches and config vars to control colo-proxy Yang Hongyang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1429716012.30934.37.camel@citrix.com \
--to=ian.campbell@citrix.com \
--cc=eddie.dong@intel.com \
--cc=ian.jackson@eu.citrix.com \
--cc=rshriram@cs.ubc.ca \
--cc=wei.liu2@citrix.com \
--cc=wency@cn.fujitsu.com \
--cc=xen-devel@lists.xen.org \
--cc=yanghy@cn.fujitsu.com \
--cc=yunhong.jiang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.