mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: Don't add trailing space in "Formating..." message

Browse Source 
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 <famz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-id: 1418110684-19528-3-git-send-email-famz@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Fam Zheng 2014-12-09 15:38:04 +08:00 committed by Stefan Hajnoczi
parent 7486458c33
commit 43c5d8f800
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block.c
View File

@ -5668,8 +5668,8 @@ void bdrv_img_create(const char *filename, const char *fmt,
} }
if (!quiet) { if (!quiet) {
printf("Formatting '%s', fmt=%s ", filename, fmt); printf("Formatting '%s', fmt=%s", filename, fmt);
qemu_opts_print(opts); qemu_opts_print(opts, " ");
puts(""); puts("");
} }

2
include/qemu/option.h
View File

@ -124,7 +124,7 @@ QDict *qemu_opts_to_qdict(QemuOpts *opts, QDict *qdict);
void qemu_opts_absorb_qdict(QemuOpts *opts, QDict *qdict, Error **errp); void qemu_opts_absorb_qdict(QemuOpts *opts, QDict *qdict, Error **errp);
typedef int (*qemu_opts_loopfunc)(QemuOpts *opts, void *opaque); 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 qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func, void *opaque,
int abort_on_failure); int abort_on_failure);
void qemu_opts_print_help(QemuOptsList *list); void qemu_opts_print_help(QemuOptsList *list);

10
util/qemu-option.c
View File

@ -737,14 +737,14 @@ void qemu_opts_del(QemuOpts *opts)
g_free(opts); g_free(opts);
} }
void qemu_opts_print(QemuOpts *opts) void qemu_opts_print(QemuOpts *opts, const char *sep)
{ {
QemuOpt *opt; QemuOpt *opt;
QemuOptDesc *desc = opts->list->desc; QemuOptDesc *desc = opts->list->desc;
if (desc[0].name == NULL) { if (desc[0].name == NULL) {
QTAILQ_FOREACH(opt, &opts->head, next) { QTAILQ_FOREACH(opt, &opts->head, next) {
printf("%s=\"%s\" ", opt->name, opt->str); printf("%s%s=\"%s\"", sep, opt->name, opt->str);
} }
return; return;
} }
@ -757,12 +757,12 @@ void qemu_opts_print(QemuOpts *opts)
continue; continue;
} }
if (desc->type == QEMU_OPT_STRING) { 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 || } else if ((desc->type == QEMU_OPT_SIZE ||
desc->type == QEMU_OPT_NUMBER) && opt) { 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 { } else {
printf("%s=%s ", desc->name, value); printf("%s%s=%s", sep, desc->name, value);
} }
} }
} }