| Message ID | 20210308165440.386489-27-kwolf@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | qapi/qom: QAPIfy --object and object-add | expand |
On 3/8/21 10:54 AM, Kevin Wolf wrote: > This switches qemu-img from a QemuOpts-based parser for --object to > user_creatable_process_cmdline() which uses a keyval parser and enforces > the QAPI schema. > > Apart from being a cleanup, this makes non-scalar properties accessible. > > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > Acked-by: Peter Krempa <pkrempa@redhat.com> > --- > qemu-img.c | 251 ++++++++++------------------------------------------- > 1 file changed, 45 insertions(+), 206 deletions(-) > > @@ -1353,7 +1303,7 @@ static int check_empty_sectors(BlockBackend *blk, int64_t offset, > /* > * Compares two images. Exit codes: > * > - * 0 - Images are identical > + * 0 - Images are identical or the requested help was printed Nice, but does the user-facing documentation need updating to match? > * 1 - Images differ > * >1 - Error occurred > */ > @@ -1423,15 +1373,21 @@ static int img_compare(int argc, char **argv) > case 'U': > force_share = true; > break; > - case OPTION_OBJECT: { > - QemuOpts *opts; > - opts = qemu_opts_parse_noisily(&qemu_object_opts, > - optarg, true); > - if (!opts) { > - ret = 2; > - goto out4; > + case OPTION_OBJECT: > + { > + Error *local_err = NULL; > + > + if (!user_creatable_add_from_str(optarg, &local_err)) { > + if (local_err) { > + error_report_err(local_err); > + exit(2); > + } else { > + /* Help was printed */ > + exit(EXIT_SUCCESS); > + } The commit message needs to be updated to call out that this bug fix was intentional, preferably mentioning the commit where we broke it (334c43e2c3). The code is fine, though, so with an improved commit message (and maybe some matching doc tweaks), Reviewed-by: Eric Blake <eblake@redhat.com>
Kevin Wolf <kwolf@redhat.com> writes: > This switches qemu-img from a QemuOpts-based parser for --object to > user_creatable_process_cmdline() which uses a keyval parser and enforces > the QAPI schema. > > Apart from being a cleanup, this makes non-scalar properties accessible. > > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > Acked-by: Peter Krempa <pkrempa@redhat.com> > --- > qemu-img.c | 251 ++++++++++------------------------------------------- > 1 file changed, 45 insertions(+), 206 deletions(-) > > diff --git a/qemu-img.c b/qemu-img.c > index e2952fe955..babb5573ab 100644 > --- a/qemu-img.c > +++ b/qemu-img.c > @@ -226,23 +226,6 @@ static void QEMU_NORETURN help(void) > exit(EXIT_SUCCESS); > } > > -static QemuOptsList qemu_object_opts = { > - .name = "object", > - .implied_opt_name = "qom-type", > - .head = QTAILQ_HEAD_INITIALIZER(qemu_object_opts.head), > - .desc = { > - { } > - }, > -}; > - > -static bool qemu_img_object_print_help(const char *type, QemuOpts *opts) > -{ > - if (user_creatable_print_help(type, opts)) { > - exit(0); > - } > - return true; > -} > - > /* > * Is @optarg safe for accumulate_options()? > * It is when multiple of them can be joined together separated by ','. > @@ -566,14 +549,9 @@ static int img_create(int argc, char **argv) > case 'u': > flags |= BDRV_O_NO_BACKING; > break; > - case OPTION_OBJECT: { > - QemuOpts *opts; > - opts = qemu_opts_parse_noisily(&qemu_object_opts, > - optarg, true); > - if (!opts) { > - goto fail; > - } > - } break; > + case OPTION_OBJECT: > + user_creatable_process_cmdline(optarg); > + break; > } > } > > @@ -589,12 +567,6 @@ static int img_create(int argc, char **argv) > } > optind++; > > - if (qemu_opts_foreach(&qemu_object_opts, > - user_creatable_add_opts_foreach, > - qemu_img_object_print_help, &error_fatal)) { > - goto fail; > - } > - > /* Get image size, if specified */ > if (optind < argc) { > int64_t sval; > @@ -804,14 +776,9 @@ static int img_check(int argc, char **argv) > case 'U': > force_share = true; > break; > - case OPTION_OBJECT: { > - QemuOpts *opts; > - opts = qemu_opts_parse_noisily(&qemu_object_opts, > - optarg, true); > - if (!opts) { > - return 1; > - } > - } break; > + case OPTION_OBJECT: > + user_creatable_process_cmdline(optarg); > + break; > case OPTION_IMAGE_OPTS: > image_opts = true; > break; > @@ -831,12 +798,6 @@ static int img_check(int argc, char **argv) > return 1; > } > > - if (qemu_opts_foreach(&qemu_object_opts, > - user_creatable_add_opts_foreach, > - qemu_img_object_print_help, &error_fatal)) { > - return 1; > - } > - > ret = bdrv_parse_cache_mode(cache, &flags, &writethrough); > if (ret < 0) { > error_report("Invalid source cache option: %s", cache); > @@ -1034,14 +995,9 @@ static int img_commit(int argc, char **argv) > return 1; > } > break; > - case OPTION_OBJECT: { > - QemuOpts *opts; > - opts = qemu_opts_parse_noisily(&qemu_object_opts, > - optarg, true); > - if (!opts) { > - return 1; > - } > - } break; > + case OPTION_OBJECT: > + user_creatable_process_cmdline(optarg); > + break; > case OPTION_IMAGE_OPTS: > image_opts = true; > break; > @@ -1058,12 +1014,6 @@ static int img_commit(int argc, char **argv) > } > filename = argv[optind++]; > > - if (qemu_opts_foreach(&qemu_object_opts, > - user_creatable_add_opts_foreach, > - qemu_img_object_print_help, &error_fatal)) { > - return 1; > - } > - > flags = BDRV_O_RDWR | BDRV_O_UNMAP; > ret = bdrv_parse_cache_mode(cache, &flags, &writethrough); > if (ret < 0) { > @@ -1353,7 +1303,7 @@ static int check_empty_sectors(BlockBackend *blk, int64_t offset, > /* > * Compares two images. Exit codes: > * > - * 0 - Images are identical > + * 0 - Images are identical or the requested help was printed > * 1 - Images differ > * >1 - Error occurred > */ > @@ -1423,15 +1373,21 @@ static int img_compare(int argc, char **argv) > case 'U': > force_share = true; > break; > - case OPTION_OBJECT: { > - QemuOpts *opts; > - opts = qemu_opts_parse_noisily(&qemu_object_opts, > - optarg, true); > - if (!opts) { > - ret = 2; > - goto out4; > + case OPTION_OBJECT: > + { > + Error *local_err = NULL; > + > + if (!user_creatable_add_from_str(optarg, &local_err)) { > + if (local_err) { > + error_report_err(local_err); > + exit(2); > + } else { > + /* Help was printed */ > + exit(EXIT_SUCCESS); > + } > + } > + break; > } > - } break; > case OPTION_IMAGE_OPTS: > image_opts = true; > break; Why is this one different? The others all call user_creatable_process_cmdline(). > @@ -1450,13 +1406,6 @@ static int img_compare(int argc, char **argv) > filename1 = argv[optind++]; > filename2 = argv[optind++]; > > - if (qemu_opts_foreach(&qemu_object_opts, > - user_creatable_add_opts_foreach, > - qemu_img_object_print_help, &error_fatal)) { > - ret = 2; > - goto out4; > - } > - > /* Initialize before goto out */ > qemu_progress_init(progress, 2.0); > > @@ -1641,7 +1590,6 @@ out2: > blk_unref(blk1); > out3: > qemu_progress_end(); > -out4: > return ret; > } > [...]
On 13/03/21 08:40, Markus Armbruster wrote: >> + if (!user_creatable_add_from_str(optarg, &local_err)) { >> + if (local_err) { >> + error_report_err(local_err); >> + exit(2); >> + } else { >> + /* Help was printed */ >> + exit(EXIT_SUCCESS); >> + } >> + } >> + break; >> } >> - } break; >> case OPTION_IMAGE_OPTS: >> image_opts = true; >> break; > Why is this one different? The others all call > user_creatable_process_cmdline(). > > It's to exit with status code 2 instead of 1. Paolo
Paolo Bonzini <pbonzini@redhat.com> writes: > On 13/03/21 08:40, Markus Armbruster wrote: >>> + if (!user_creatable_add_from_str(optarg, &local_err)) { >>> + if (local_err) { >>> + error_report_err(local_err); >>> + exit(2); >>> + } else { >>> + /* Help was printed */ >>> + exit(EXIT_SUCCESS); >>> + } >>> + } >>> + break; >>> } >>> - } break; >>> case OPTION_IMAGE_OPTS: >>> image_opts = true; >>> break; >> Why is this one different? The others all call >> user_creatable_process_cmdline(). >> >> > > It's to exit with status code 2 instead of 1. I see. Worth a comment?
Am 13.03.2021 um 13:30 hat Markus Armbruster geschrieben: > Paolo Bonzini <pbonzini@redhat.com> writes: > > > On 13/03/21 08:40, Markus Armbruster wrote: > >>> + if (!user_creatable_add_from_str(optarg, &local_err)) { > >>> + if (local_err) { > >>> + error_report_err(local_err); > >>> + exit(2); > >>> + } else { > >>> + /* Help was printed */ > >>> + exit(EXIT_SUCCESS); > >>> + } > >>> + } > >>> + break; > >>> } > >>> - } break; > >>> case OPTION_IMAGE_OPTS: > >>> image_opts = true; > >>> break; > >> Why is this one different? The others all call > >> user_creatable_process_cmdline(). > >> > >> > > > > It's to exit with status code 2 instead of 1. > > I see. Worth a comment? There is a comment at the start of the function (which is just a few lines above) that explains the exit codes: * Compares two images. Exit codes: * * 0 - Images are identical or the requested help was printed * 1 - Images differ * >1 - Error occurred Kevin
Kevin Wolf <kwolf@redhat.com> writes: > Am 13.03.2021 um 13:30 hat Markus Armbruster geschrieben: >> Paolo Bonzini <pbonzini@redhat.com> writes: >> >> > On 13/03/21 08:40, Markus Armbruster wrote: >> >>> + if (!user_creatable_add_from_str(optarg, &local_err)) { >> >>> + if (local_err) { >> >>> + error_report_err(local_err); >> >>> + exit(2); >> >>> + } else { >> >>> + /* Help was printed */ >> >>> + exit(EXIT_SUCCESS); >> >>> + } >> >>> + } >> >>> + break; >> >>> } >> >>> - } break; >> >>> case OPTION_IMAGE_OPTS: >> >>> image_opts = true; >> >>> break; >> >> Why is this one different? The others all call >> >> user_creatable_process_cmdline(). >> >> >> >> >> > >> > It's to exit with status code 2 instead of 1. >> >> I see. Worth a comment? > > There is a comment at the start of the function (which is just a few > lines above) that explains the exit codes: > > * Compares two images. Exit codes: > * > * 0 - Images are identical or the requested help was printed > * 1 - Images differ > * >1 - Error occurred I had in mind a comment that helps me over the "why is this not using user_creatable_process_cmdline()" hump. Like so: case OPTION_OBJECT: { /* * Can't use user_creatable_process_cmdline(), because * we need to exit(2) on error. */ ... open-coded variation of user_creatable_process_cmdline() ... } Entirely up to you.
Am 15.03.2021 um 15:15 hat Markus Armbruster geschrieben: > Kevin Wolf <kwolf@redhat.com> writes: > > > Am 13.03.2021 um 13:30 hat Markus Armbruster geschrieben: > >> Paolo Bonzini <pbonzini@redhat.com> writes: > >> > >> > On 13/03/21 08:40, Markus Armbruster wrote: > >> >>> + if (!user_creatable_add_from_str(optarg, &local_err)) { > >> >>> + if (local_err) { > >> >>> + error_report_err(local_err); > >> >>> + exit(2); > >> >>> + } else { > >> >>> + /* Help was printed */ > >> >>> + exit(EXIT_SUCCESS); > >> >>> + } > >> >>> + } > >> >>> + break; > >> >>> } > >> >>> - } break; > >> >>> case OPTION_IMAGE_OPTS: > >> >>> image_opts = true; > >> >>> break; > >> >> Why is this one different? The others all call > >> >> user_creatable_process_cmdline(). > >> >> > >> >> > >> > > >> > It's to exit with status code 2 instead of 1. > >> > >> I see. Worth a comment? > > > > There is a comment at the start of the function (which is just a few > > lines above) that explains the exit codes: > > > > * Compares two images. Exit codes: > > * > > * 0 - Images are identical or the requested help was printed > > * 1 - Images differ > > * >1 - Error occurred > > I had in mind a comment that helps me over the "why is this not using > user_creatable_process_cmdline()" hump. Like so: > > case OPTION_OBJECT: > { > /* > * Can't use user_creatable_process_cmdline(), because > * we need to exit(2) on error. > */ > ... open-coded variation of > user_creatable_process_cmdline() ... > } > > Entirely up to you. I see. This patch is already part of a pull request, but I wouldn't mind a follow-up patch to add this comment if you want to send one. Kevin
diff --git a/qemu-img.c b/qemu-img.c index e2952fe955..babb5573ab 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -226,23 +226,6 @@ static void QEMU_NORETURN help(void) exit(EXIT_SUCCESS); } -static QemuOptsList qemu_object_opts = { - .name = "object", - .implied_opt_name = "qom-type", - .head = QTAILQ_HEAD_INITIALIZER(qemu_object_opts.head), - .desc = { - { } - }, -}; - -static bool qemu_img_object_print_help(const char *type, QemuOpts *opts) -{ - if (user_creatable_print_help(type, opts)) { - exit(0); - } - return true; -} - /* * Is @optarg safe for accumulate_options()? * It is when multiple of them can be joined together separated by ','. @@ -566,14 +549,9 @@ static int img_create(int argc, char **argv) case 'u': flags |= BDRV_O_NO_BACKING; break; - case OPTION_OBJECT: { - QemuOpts *opts; - opts = qemu_opts_parse_noisily(&qemu_object_opts, - optarg, true); - if (!opts) { - goto fail; - } - } break; + case OPTION_OBJECT: + user_creatable_process_cmdline(optarg); + break; } } @@ -589,12 +567,6 @@ static int img_create(int argc, char **argv) } optind++; - if (qemu_opts_foreach(&qemu_object_opts, - user_creatable_add_opts_foreach, - qemu_img_object_print_help, &error_fatal)) { - goto fail; - } - /* Get image size, if specified */ if (optind < argc) { int64_t sval; @@ -804,14 +776,9 @@ static int img_check(int argc, char **argv) case 'U': force_share = true; break; - case OPTION_OBJECT: { - QemuOpts *opts; - opts = qemu_opts_parse_noisily(&qemu_object_opts, - optarg, true); - if (!opts) { - return 1; - } - } break; + case OPTION_OBJECT: + user_creatable_process_cmdline(optarg); + break; case OPTION_IMAGE_OPTS: image_opts = true; break; @@ -831,12 +798,6 @@ static int img_check(int argc, char **argv) return 1; } - if (qemu_opts_foreach(&qemu_object_opts, - user_creatable_add_opts_foreach, - qemu_img_object_print_help, &error_fatal)) { - return 1; - } - ret = bdrv_parse_cache_mode(cache, &flags, &writethrough); if (ret < 0) { error_report("Invalid source cache option: %s", cache); @@ -1034,14 +995,9 @@ static int img_commit(int argc, char **argv) return 1; } break; - case OPTION_OBJECT: { - QemuOpts *opts; - opts = qemu_opts_parse_noisily(&qemu_object_opts, - optarg, true); - if (!opts) { - return 1; - } - } break; + case OPTION_OBJECT: + user_creatable_process_cmdline(optarg); + break; case OPTION_IMAGE_OPTS: image_opts = true; break; @@ -1058,12 +1014,6 @@ static int img_commit(int argc, char **argv) } filename = argv[optind++]; - if (qemu_opts_foreach(&qemu_object_opts, - user_creatable_add_opts_foreach, - qemu_img_object_print_help, &error_fatal)) { - return 1; - } - flags = BDRV_O_RDWR | BDRV_O_UNMAP; ret = bdrv_parse_cache_mode(cache, &flags, &writethrough); if (ret < 0) { @@ -1353,7 +1303,7 @@ static int check_empty_sectors(BlockBackend *blk, int64_t offset, /* * Compares two images. Exit codes: * - * 0 - Images are identical + * 0 - Images are identical or the requested help was printed * 1 - Images differ * >1 - Error occurred */ @@ -1423,15 +1373,21 @@ static int img_compare(int argc, char **argv) case 'U': force_share = true; break; - case OPTION_OBJECT: { - QemuOpts *opts; - opts = qemu_opts_parse_noisily(&qemu_object_opts, - optarg, true); - if (!opts) { - ret = 2; - goto out4; + case OPTION_OBJECT: + { + Error *local_err = NULL; + + if (!user_creatable_add_from_str(optarg, &local_err)) { + if (local_err) { + error_report_err(local_err); + exit(2); + } else { + /* Help was printed */ + exit(EXIT_SUCCESS); + } + } + break; } - } break; case OPTION_IMAGE_OPTS: image_opts = true; break; @@ -1450,13 +1406,6 @@ static int img_compare(int argc, char **argv) filename1 = argv[optind++]; filename2 = argv[optind++]; - if (qemu_opts_foreach(&qemu_object_opts, - user_creatable_add_opts_foreach, - qemu_img_object_print_help, &error_fatal)) { - ret = 2; - goto out4; - } - /* Initialize before goto out */ qemu_progress_init(progress, 2.0); @@ -1641,7 +1590,6 @@ out2: blk_unref(blk1); out3: qemu_progress_end(); -out4: return ret; } @@ -2342,15 +2290,9 @@ static int img_convert(int argc, char **argv) goto fail_getopt; } break; - case OPTION_OBJECT: { - QemuOpts *object_opts; - object_opts = qemu_opts_parse_noisily(&qemu_object_opts, - optarg, true); - if (!object_opts) { - goto fail_getopt; - } + case OPTION_OBJECT: + user_creatable_process_cmdline(optarg); break; - } case OPTION_IMAGE_OPTS: image_opts = true; break; @@ -2378,12 +2320,6 @@ static int img_convert(int argc, char **argv) out_fmt = "raw"; } - if (qemu_opts_foreach(&qemu_object_opts, - user_creatable_add_opts_foreach, - qemu_img_object_print_help, &error_fatal)) { - goto fail_getopt; - } - if (s.compressed && s.copy_range) { error_report("Cannot enable copy offloading when -c is used"); goto fail_getopt; @@ -2971,14 +2907,9 @@ static int img_info(int argc, char **argv) case OPTION_BACKING_CHAIN: chain = true; break; - case OPTION_OBJECT: { - QemuOpts *opts; - opts = qemu_opts_parse_noisily(&qemu_object_opts, - optarg, true); - if (!opts) { - return 1; - } - } break; + case OPTION_OBJECT: + user_creatable_process_cmdline(optarg); + break; case OPTION_IMAGE_OPTS: image_opts = true; break; @@ -2998,12 +2929,6 @@ static int img_info(int argc, char **argv) return 1; } - if (qemu_opts_foreach(&qemu_object_opts, - user_creatable_add_opts_foreach, - qemu_img_object_print_help, &error_fatal)) { - return 1; - } - list = collect_image_info_list(image_opts, filename, fmt, chain, force_share); if (!list) { @@ -3213,14 +3138,9 @@ static int img_map(int argc, char **argv) return 1; } break; - case OPTION_OBJECT: { - QemuOpts *opts; - opts = qemu_opts_parse_noisily(&qemu_object_opts, - optarg, true); - if (!opts) { - return 1; - } - } break; + case OPTION_OBJECT: + user_creatable_process_cmdline(optarg); + break; case OPTION_IMAGE_OPTS: image_opts = true; break; @@ -3240,12 +3160,6 @@ static int img_map(int argc, char **argv) return 1; } - if (qemu_opts_foreach(&qemu_object_opts, - user_creatable_add_opts_foreach, - qemu_img_object_print_help, &error_fatal)) { - return 1; - } - blk = img_open(image_opts, filename, fmt, 0, false, false, force_share); if (!blk) { return 1; @@ -3384,14 +3298,9 @@ static int img_snapshot(int argc, char **argv) case 'U': force_share = true; break; - case OPTION_OBJECT: { - QemuOpts *opts; - opts = qemu_opts_parse_noisily(&qemu_object_opts, - optarg, true); - if (!opts) { - return 1; - } - } break; + case OPTION_OBJECT: + user_creatable_process_cmdline(optarg); + break; case OPTION_IMAGE_OPTS: image_opts = true; break; @@ -3403,12 +3312,6 @@ static int img_snapshot(int argc, char **argv) } filename = argv[optind++]; - if (qemu_opts_foreach(&qemu_object_opts, - user_creatable_add_opts_foreach, - qemu_img_object_print_help, &error_fatal)) { - return 1; - } - /* Open the image */ blk = img_open(image_opts, filename, NULL, bdrv_oflags, false, quiet, force_share); @@ -3542,14 +3445,9 @@ static int img_rebase(int argc, char **argv) case 'q': quiet = true; break; - case OPTION_OBJECT: { - QemuOpts *opts; - opts = qemu_opts_parse_noisily(&qemu_object_opts, - optarg, true); - if (!opts) { - return 1; - } - } break; + case OPTION_OBJECT: + user_creatable_process_cmdline(optarg); + break; case OPTION_IMAGE_OPTS: image_opts = true; break; @@ -3571,12 +3469,6 @@ static int img_rebase(int argc, char **argv) } filename = argv[optind++]; - if (qemu_opts_foreach(&qemu_object_opts, - user_creatable_add_opts_foreach, - qemu_img_object_print_help, &error_fatal)) { - return 1; - } - qemu_progress_init(progress, 2.0); qemu_progress_print(0, 100); @@ -3967,14 +3859,9 @@ static int img_resize(int argc, char **argv) case 'q': quiet = true; break; - case OPTION_OBJECT: { - QemuOpts *opts; - opts = qemu_opts_parse_noisily(&qemu_object_opts, - optarg, true); - if (!opts) { - return 1; - } - } break; + case OPTION_OBJECT: + user_creatable_process_cmdline(optarg); + break; case OPTION_IMAGE_OPTS: image_opts = true; break; @@ -3996,12 +3883,6 @@ static int img_resize(int argc, char **argv) } filename = argv[optind++]; - if (qemu_opts_foreach(&qemu_object_opts, - user_creatable_add_opts_foreach, - qemu_img_object_print_help, &error_fatal)) { - return 1; - } - /* Choose grow, shrink, or absolute resize mode */ switch (size[0]) { case '+': @@ -4181,12 +4062,7 @@ static int img_amend(int argc, char **argv) quiet = true; break; case OPTION_OBJECT: - opts = qemu_opts_parse_noisily(&qemu_object_opts, - optarg, true); - if (!opts) { - ret = -1; - goto out_no_progress; - } + user_creatable_process_cmdline(optarg); break; case OPTION_IMAGE_OPTS: image_opts = true; @@ -4201,13 +4077,6 @@ static int img_amend(int argc, char **argv) error_exit("Must specify options (-o)"); } - if (qemu_opts_foreach(&qemu_object_opts, - user_creatable_add_opts_foreach, - qemu_img_object_print_help, &error_fatal)) { - ret = -1; - goto out_no_progress; - } - if (quiet) { progress = false; } @@ -4760,10 +4629,7 @@ static int img_bitmap(int argc, char **argv) merge = true; break; case OPTION_OBJECT: - opts = qemu_opts_parse_noisily(&qemu_object_opts, optarg, true); - if (!opts) { - goto out; - } + user_creatable_process_cmdline(optarg); break; case OPTION_IMAGE_OPTS: image_opts = true; @@ -4771,12 +4637,6 @@ static int img_bitmap(int argc, char **argv) } } - if (qemu_opts_foreach(&qemu_object_opts, - user_creatable_add_opts_foreach, - qemu_img_object_print_help, &error_fatal)) { - goto out; - } - if (QSIMPLEQ_EMPTY(&actions)) { error_report("Need at least one of --add, --remove, --clear, " "--enable, --disable, or --merge"); @@ -5034,10 +4894,7 @@ static int img_dd(int argc, char **argv) force_share = true; break; case OPTION_OBJECT: - if (!qemu_opts_parse_noisily(&qemu_object_opts, optarg, true)) { - ret = -1; - goto out; - } + user_creatable_process_cmdline(optarg); break; case OPTION_IMAGE_OPTS: image_opts = true; @@ -5084,13 +4941,6 @@ static int img_dd(int argc, char **argv) goto out; } - if (qemu_opts_foreach(&qemu_object_opts, - user_creatable_add_opts_foreach, - qemu_img_object_print_help, &error_fatal)) { - ret = -1; - goto out; - } - blk1 = img_open(image_opts, in.filename, fmt, 0, false, false, force_share); @@ -5311,11 +5161,7 @@ static int img_measure(int argc, char **argv) force_share = true; break; case OPTION_OBJECT: - object_opts = qemu_opts_parse_noisily(&qemu_object_opts, - optarg, true); - if (!object_opts) { - goto out; - } + user_creatable_process_cmdline(optarg); break; case OPTION_IMAGE_OPTS: image_opts = true; @@ -5345,12 +5191,6 @@ static int img_measure(int argc, char **argv) } } - if (qemu_opts_foreach(&qemu_object_opts, - user_creatable_add_opts_foreach, - qemu_img_object_print_help, &error_fatal)) { - goto out; - } - if (argc - optind > 1) { error_report("At most one filename argument is allowed."); goto out; @@ -5490,7 +5330,6 @@ int main(int argc, char **argv) error_exit("Not enough arguments"); } - qemu_add_opts(&qemu_object_opts); qemu_add_opts(&qemu_source_opts); qemu_add_opts(&qemu_trace_opts);