Re: [Qemu-devel] [PATCH 1/5] qga: drop guest_file_init helper and replace it with static initializers

[Michael Roth]

Quoting Denis V. Lunev (2015-10-01 02:37:59)
> This just makes code shorter and better.

Can't complain with that.

> 
> Signed-off-by: Denis V. Lunev <address@hidden>
> Signed-off-by: Yuri Pudgorodskiy <address@hidden>
> CC: Michael Roth <address@hidden>

Reviewed-by: Michael Roth <address@hidden>

> ---
>  qga/commands-posix.c | 10 +++-------
>  qga/commands-win32.c | 10 +++-------
>  2 files changed, 6 insertions(+), 14 deletions(-)
> 
> diff --git a/qga/commands-posix.c b/qga/commands-posix.c
> index b03c316..8989912 100644
> --- a/qga/commands-posix.c
> +++ b/qga/commands-posix.c
> @@ -223,7 +223,9 @@ typedef struct GuestFileHandle {
> 
>  static struct {
>      QTAILQ_HEAD(, GuestFileHandle) filehandles;
> -} guest_file_state;
> +} guest_file_state = {
> +    .filehandles = QTAILQ_HEAD_INITIALIZER(guest_file_state.filehandles),
> +};
> 
>  static int64_t guest_file_handle_add(FILE *fh, Error **errp)
>  {
> @@ -586,11 +588,6 @@ void qmp_guest_file_flush(int64_t handle, Error **errp)
>      }
>  }
> 
> -static void guest_file_init(void)
> -{
> -    QTAILQ_INIT(&guest_file_state.filehandles);
> -}
> -
>  /* linux-specific implementations. avoid this if at all possible. */
>  #if defined(__linux__)
> 
> @@ -2486,5 +2483,4 @@ void ga_command_state_init(GAState *s, GACommandState 
> *cs)
>  #if defined(CONFIG_FSFREEZE)
>      ga_command_state_add(cs, NULL, guest_fsfreeze_cleanup);
>  #endif
> -    ga_command_state_add(cs, guest_file_init, NULL);
>  }
> diff --git a/qga/commands-win32.c b/qga/commands-win32.c
> index 41bdd3f..3374678 100644
> --- a/qga/commands-win32.c
> +++ b/qga/commands-win32.c
> @@ -55,7 +55,9 @@ typedef struct GuestFileHandle {
> 
>  static struct {
>      QTAILQ_HEAD(, GuestFileHandle) filehandles;
> -} guest_file_state;
> +} guest_file_state = {
> +    .filehandles = QTAILQ_HEAD_INITIALIZER(guest_file_state.filehandles),
> +};
> 
> 
>  typedef struct OpenFlags {
> @@ -390,11 +392,6 @@ void qmp_guest_file_flush(int64_t handle, Error **errp)
>      }
>  }
> 
> -static void guest_file_init(void)
> -{
> -    QTAILQ_INIT(&guest_file_state.filehandles);
> -}
> -
>  #ifdef CONFIG_QGA_NTDDSCSI
> 
>  static STORAGE_BUS_TYPE win2qemu[] = {
> @@ -1330,5 +1327,4 @@ void ga_command_state_init(GAState *s, GACommandState 
> *cs)
>      if (!vss_initialized()) {
>          ga_command_state_add(cs, NULL, guest_fsfreeze_cleanup);
>      }
> -    ga_command_state_add(cs, guest_file_init, NULL);
>  }
> -- 
> 2.1.4
>