Commit 43c5d8f8 authored by Fam Zheng's avatar Fam Zheng Committed by Stefan Hajnoczi
Browse files

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



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: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-id: 1418110684-19528-3-git-send-email-famz@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 7486458c

block.c

+2 −2
Original line number Diff line number Diff line
@@ -5669,7 +5669,7 @@ void bdrv_img_create(const char *filename, const char *fmt, 


    if (!quiet) {

        printf("Formatting '%s', fmt=%s", filename, fmt);

        qemu_opts_print(opts);

        qemu_opts_print(opts, " ");

        puts("");

    }

include/qemu/option.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

util/qemu-option.c

+5 −5
Original line number Diff line number Diff line
@@ -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);

        }

    }

}