Re: [Xen-devel] [RFC PATCH COLO v5 11/29] adjust the indentation

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

On Wed, 2015-04-01 at 14:41 +0800, Yang Hongyang wrote:
> From: Wen Congyang <wency@xxxxxxxxxxxxxx>

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@xxxxxxxxxxxxxx>
> ---
>  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);



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel