Re: [Qemu-devel] [PATCH for-2.3 2/2] block: Don't add trailing space in "Formating..." message

[Markus Armbruster]

Fam Zheng <address@hidden> writes:

> Change the message printing code to output a separator for each option
> string before it instead of after, then we don't one more extra ' ' in
> the end.
>
> To update qemu-iotests output files, most of the times one would just
> copy the *.out.bad to *.out. With this change we will not have the
> space disliked by checkpatch.pl.
>
> Signed-off-by: Fam Zheng <address@hidden>
> ---
>  block.c               |  4 ++--
>  include/qemu/option.h |  2 +-
>  util/qemu-option.c    | 10 +++++-----
>  3 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/block.c b/block.c
> index a612594..288e7ff6 100644
> --- a/block.c
> +++ b/block.c
> @@ -5628,8 +5628,8 @@ void bdrv_img_create(const char *filename, const char 
> *fmt,
>      }
>  
>      if (!quiet) {
> -        printf("Formatting '%s', fmt=%s ", filename, fmt);
> -        qemu_opts_print(opts);
> +        printf("Formatting '%s', fmt=%s", filename, fmt);
> +        qemu_opts_print(opts, " ");
>          puts("");
>      }
>  
> diff --git a/include/qemu/option.h b/include/qemu/option.h
> index 59bea75..58c0157 100644
> --- a/include/qemu/option.h
> +++ b/include/qemu/option.h
> @@ -124,7 +124,7 @@ QDict *qemu_opts_to_qdict(QemuOpts *opts, QDict *qdict);
>  void qemu_opts_absorb_qdict(QemuOpts *opts, QDict *qdict, Error **errp);
>  
>  typedef int (*qemu_opts_loopfunc)(QemuOpts *opts, void *opaque);
> -void qemu_opts_print(QemuOpts *opts);
> +void qemu_opts_print(QemuOpts *opts, const char *sep);
>  int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func, void 
> *opaque,
>                        int abort_on_failure);
>  void qemu_opts_print_help(QemuOptsList *list);
> diff --git a/util/qemu-option.c b/util/qemu-option.c
> index 5d10695..a708241 100644
> --- a/util/qemu-option.c
> +++ b/util/qemu-option.c
> @@ -737,14 +737,14 @@ void qemu_opts_del(QemuOpts *opts)
>      g_free(opts);
>  }
>  
> -void qemu_opts_print(QemuOpts *opts)
> +void qemu_opts_print(QemuOpts *opts, const char *sep)
>  {
>      QemuOpt *opt;
>      QemuOptDesc *desc = opts->list->desc;
>  
>      if (desc[0].name == NULL) {
>          QTAILQ_FOREACH(opt, &opts->head, next) {
> -            printf("%s=\"%s\" ", opt->name, opt->str);
> +            printf("%s%s=\"%s\"", sep, opt->name, opt->str);
>          }
>          return;
>      }
> @@ -757,12 +757,12 @@ void qemu_opts_print(QemuOpts *opts)
>              continue;
>          }
>          if (desc->type == QEMU_OPT_STRING) {
> -            printf("%s='%s' ", desc->name, value);
> +            printf("%s%s='%s'", sep, desc->name, value);
>          } else if ((desc->type == QEMU_OPT_SIZE ||
>                      desc->type == QEMU_OPT_NUMBER) && opt) {
> -            printf("%s=%" PRId64 " ", desc->name, opt->value.uint);
> +            printf("%s%s=%" PRId64, sep, desc->name, opt->value.uint);
>          } else {
> -            printf("%s=%s ", desc->name, value);
> +            printf("%s%s=%s", sep, desc->name, value);
>          }
>      }
>  }

Parameter sep is kind of odd.  May naive expectation would be it
separates the options.  Which it does, but additionally it separates the
first option from whatever is printed before this call.  Works, because
there's just one caller, and this caller always prints something before
qemu_opt_number(), and it wants ' ' for both purposes.  Oh well, it'll
do.

For a more general qemu_opts_print(), we'd want prefix, separator,
suffix.  Before this patch, they're hardcoded "", " " and "".
Afterwards, they're sep, sep, "".