Now that the two branches of this function are similar, turn it into a single call to opts_parse().
Signed-off-by: Fabiano Rosas <[email protected]> --- util/qemu-option.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/util/qemu-option.c b/util/qemu-option.c index 8dadb47170..1e8042a1bd 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -950,19 +950,18 @@ QemuOpts *qemu_opts_parse_list(QemuOptsList *list, const char *params, { bool noisily = !errp; QemuOpts *opts = NULL; + Error *err = NULL; assert(list); + opts = opts_parse(list, params, permit_abbrev, noisily, &err); - if (noisily) { - Error *err = NULL; - - opts = opts_parse(list, params, permit_abbrev, noisily, &err); - if (!opts && err) { + if (!opts) { + assert(err); + if (noisily) { error_report_err(err); + } else { + error_propagate(errp, err); } - - } else { - opts = opts_parse(list, params, permit_abbrev, noisily, errp); } return opts; -- 2.53.0
