From nobody Mon Nov 17 19:53:36 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605105284; cv=none; d=zohomail.com; s=zohoarc; b=cRxH9A6iXAFx/bzmlv6vW8u546eHrArSsSypVZb9XR1HapGEkwHHgv5AORI50N4dh1/PQgx1ubL+B5yAjYXnHJcws09lLc+hmni5C3ITqyK8ZFAGHlCYLsl+BQ99X0/9ImO93TCV3FrxL8Hd7vn6aaCMQGoSFX4kVi2Hed7ouQw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605105284; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=y/I1UKAuFkhg4uNFK4p8T6uf6h2FIq3Qwbuil6+xSpM=; b=Abzh010QMX78TObVpsv09o0HwAoCzo8nD0ho+NG4f0wzwhEzHraDVQOkqZov8tE65B9Piwd/RVbm4F2aoE53FVZvJuelKZb8mKaNlAwuE1kHds/29OnLNOHq7PwWDiCdz+1DfeisYOkBcN2WUpcBDK1F51INfuIIbEXivXIa7Dc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605105284194344.05111902554097; Wed, 11 Nov 2020 06:34:44 -0800 (PST) Received: from localhost ([::1]:40492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcrCs-0002VT-LH for importer@patchew.org; Wed, 11 Nov 2020 09:34:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35894) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcr4J-0008Sv-Ds for qemu-devel@nongnu.org; Wed, 11 Nov 2020 09:25:51 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:44895) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kcr4G-0001rg-Ot for qemu-devel@nongnu.org; Wed, 11 Nov 2020 09:25:51 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-458-m1YGykKWPuq39cyqOCV0Gg-1; Wed, 11 Nov 2020 09:25:41 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1D5C610557CC for ; Wed, 11 Nov 2020 14:25:41 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id CE89960CD0; Wed, 11 Nov 2020 14:25:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605104748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=y/I1UKAuFkhg4uNFK4p8T6uf6h2FIq3Qwbuil6+xSpM=; b=Cc723DFQpO/ceJPy//2mrEP/dhpSI+a10RtH4pTWvnvRhjNqAeH/hm3jhZPDh2KOr/AjNL aXebldZfE4F4iw1bAzLL/PMPAi70MskgIBmbxJnkQ+peR9Fr2qw5H+ZqaRwJ49Y0fpyELU MsccvrgwsDIhjnQ83DNkw52sFhFRVRs= X-MC-Unique: m1YGykKWPuq39cyqOCV0Gg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 08/12] qemu-img: use keyval for -object parsing Date: Wed, 11 Nov 2020 09:25:33 -0500 Message-Id: <20201111142537.1213209-9-pbonzini@redhat.com> In-Reply-To: <20201111142537.1213209-1-pbonzini@redhat.com> References: <20201111142537.1213209-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/11 01:42:46 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Enable creation of object with non-scalar properties. Signed-off-by: Paolo Bonzini --- qemu-img.c | 258 +++++++++++------------------------------------------ 1 file changed, 52 insertions(+), 206 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 8bdea40b58..a91bbba4c6 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -227,21 +227,27 @@ static void QEMU_NORETURN help(void) exit(EXIT_SUCCESS); } =20 -static QemuOptsList qemu_object_opts =3D { - .name =3D "object", - .implied_opt_name =3D "qom-type", - .head =3D QTAILQ_HEAD_INITIALIZER(qemu_object_opts.head), - .desc =3D { - { } - }, -}; - -static bool qemu_img_object_print_help(const char *type, QemuOpts *opts) +static void qemu_img_object_parse(const char *optarg, int exit_code) { - if (user_creatable_print_help(type, opts)) { - exit(0); + QDict *args; + bool help; + Error *local_error =3D NULL; + + args =3D keyval_parse(optarg, "qom-type", &help, &local_error); + if (local_error) { + error_report_err(local_error); + exit(exit_code); } - return true; + if (help) { + user_creatable_print_help_from_qdict(args); + exit(EXIT_SUCCESS); + } + user_creatable_add_dict(args, true, &local_error); + if (local_error) { + error_report_err(local_error); + exit(exit_code); + } + qobject_unref(args); } =20 /* @@ -567,14 +573,9 @@ static int img_create(int argc, char **argv) case 'u': flags |=3D BDRV_O_NO_BACKING; break; - case OPTION_OBJECT: { - QemuOpts *opts; - opts =3D qemu_opts_parse_noisily(&qemu_object_opts, - optarg, true); - if (!opts) { - goto fail; - } - } break; + case OPTION_OBJECT: + qemu_img_object_parse(optarg, 1); + break; } } =20 @@ -590,12 +591,6 @@ static int img_create(int argc, char **argv) } optind++; =20 - 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; @@ -805,14 +800,9 @@ static int img_check(int argc, char **argv) case 'U': force_share =3D true; break; - case OPTION_OBJECT: { - QemuOpts *opts; - opts =3D qemu_opts_parse_noisily(&qemu_object_opts, - optarg, true); - if (!opts) { - return 1; - } - } break; + case OPTION_OBJECT: + qemu_img_object_parse(optarg, 1); + break; case OPTION_IMAGE_OPTS: image_opts =3D true; break; @@ -832,12 +822,6 @@ static int img_check(int argc, char **argv) return 1; } =20 - if (qemu_opts_foreach(&qemu_object_opts, - user_creatable_add_opts_foreach, - qemu_img_object_print_help, &error_fatal)) { - return 1; - } - ret =3D bdrv_parse_cache_mode(cache, &flags, &writethrough); if (ret < 0) { error_report("Invalid source cache option: %s", cache); @@ -1035,14 +1019,9 @@ static int img_commit(int argc, char **argv) return 1; } break; - case OPTION_OBJECT: { - QemuOpts *opts; - opts =3D qemu_opts_parse_noisily(&qemu_object_opts, - optarg, true); - if (!opts) { - return 1; - } - } break; + case OPTION_OBJECT: + qemu_img_object_parse(optarg, 1); + break; case OPTION_IMAGE_OPTS: image_opts =3D true; break; @@ -1059,12 +1038,6 @@ static int img_commit(int argc, char **argv) } filename =3D argv[optind++]; =20 - if (qemu_opts_foreach(&qemu_object_opts, - user_creatable_add_opts_foreach, - qemu_img_object_print_help, &error_fatal)) { - return 1; - } - flags =3D BDRV_O_RDWR | BDRV_O_UNMAP; ret =3D bdrv_parse_cache_mode(cache, &flags, &writethrough); if (ret < 0) { @@ -1424,15 +1397,9 @@ static int img_compare(int argc, char **argv) case 'U': force_share =3D true; break; - case OPTION_OBJECT: { - QemuOpts *opts; - opts =3D qemu_opts_parse_noisily(&qemu_object_opts, - optarg, true); - if (!opts) { - ret =3D 2; - goto out4; - } - } break; + case OPTION_OBJECT: + qemu_img_object_parse(optarg, 2); + break; case OPTION_IMAGE_OPTS: image_opts =3D true; break; @@ -1451,13 +1418,6 @@ static int img_compare(int argc, char **argv) filename1 =3D argv[optind++]; filename2 =3D argv[optind++]; =20 - if (qemu_opts_foreach(&qemu_object_opts, - user_creatable_add_opts_foreach, - qemu_img_object_print_help, &error_fatal)) { - ret =3D 2; - goto out4; - } - /* Initialize before goto out */ qemu_progress_init(progress, 2.0); =20 @@ -1642,7 +1602,6 @@ out2: blk_unref(blk1); out3: qemu_progress_end(); -out4: return ret; } =20 @@ -2344,15 +2303,9 @@ static int img_convert(int argc, char **argv) goto fail_getopt; } break; - case OPTION_OBJECT: { - QemuOpts *object_opts; - object_opts =3D qemu_opts_parse_noisily(&qemu_object_opts, - optarg, true); - if (!object_opts) { - goto fail_getopt; - } + case OPTION_OBJECT: + qemu_img_object_parse(optarg, 1); break; - } case OPTION_IMAGE_OPTS: image_opts =3D true; break; @@ -2380,12 +2333,6 @@ static int img_convert(int argc, char **argv) out_fmt =3D "raw"; } =20 - 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; @@ -2977,14 +2924,9 @@ static int img_info(int argc, char **argv) case OPTION_BACKING_CHAIN: chain =3D true; break; - case OPTION_OBJECT: { - QemuOpts *opts; - opts =3D qemu_opts_parse_noisily(&qemu_object_opts, - optarg, true); - if (!opts) { - return 1; - } - } break; + case OPTION_OBJECT: + qemu_img_object_parse(optarg, 1); + break; case OPTION_IMAGE_OPTS: image_opts =3D true; break; @@ -3004,12 +2946,6 @@ static int img_info(int argc, char **argv) return 1; } =20 - if (qemu_opts_foreach(&qemu_object_opts, - user_creatable_add_opts_foreach, - qemu_img_object_print_help, &error_fatal)) { - return 1; - } - list =3D collect_image_info_list(image_opts, filename, fmt, chain, force_share); if (!list) { @@ -3219,14 +3155,9 @@ static int img_map(int argc, char **argv) return 1; } break; - case OPTION_OBJECT: { - QemuOpts *opts; - opts =3D qemu_opts_parse_noisily(&qemu_object_opts, - optarg, true); - if (!opts) { - return 1; - } - } break; + case OPTION_OBJECT: + qemu_img_object_parse(optarg, 1); + break; case OPTION_IMAGE_OPTS: image_opts =3D true; break; @@ -3246,12 +3177,6 @@ static int img_map(int argc, char **argv) return 1; } =20 - if (qemu_opts_foreach(&qemu_object_opts, - user_creatable_add_opts_foreach, - qemu_img_object_print_help, &error_fatal)) { - return 1; - } - blk =3D img_open(image_opts, filename, fmt, 0, false, false, force_sha= re); if (!blk) { return 1; @@ -3390,14 +3315,9 @@ static int img_snapshot(int argc, char **argv) case 'U': force_share =3D true; break; - case OPTION_OBJECT: { - QemuOpts *opts; - opts =3D qemu_opts_parse_noisily(&qemu_object_opts, - optarg, true); - if (!opts) { - return 1; - } - } break; + case OPTION_OBJECT: + qemu_img_object_parse(optarg, 1); + break; case OPTION_IMAGE_OPTS: image_opts =3D true; break; @@ -3409,12 +3329,6 @@ static int img_snapshot(int argc, char **argv) } filename =3D argv[optind++]; =20 - 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 =3D img_open(image_opts, filename, NULL, bdrv_oflags, false, quiet, force_share); @@ -3548,14 +3462,9 @@ static int img_rebase(int argc, char **argv) case 'q': quiet =3D true; break; - case OPTION_OBJECT: { - QemuOpts *opts; - opts =3D qemu_opts_parse_noisily(&qemu_object_opts, - optarg, true); - if (!opts) { - return 1; - } - } break; + case OPTION_OBJECT: + qemu_img_object_parse(optarg, 1); + break; case OPTION_IMAGE_OPTS: image_opts =3D true; break; @@ -3577,12 +3486,6 @@ static int img_rebase(int argc, char **argv) } filename =3D argv[optind++]; =20 - 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); =20 @@ -3973,14 +3876,9 @@ static int img_resize(int argc, char **argv) case 'q': quiet =3D true; break; - case OPTION_OBJECT: { - QemuOpts *opts; - opts =3D qemu_opts_parse_noisily(&qemu_object_opts, - optarg, true); - if (!opts) { - return 1; - } - } break; + case OPTION_OBJECT: + qemu_img_object_parse(optarg, 1); + break; case OPTION_IMAGE_OPTS: image_opts =3D true; break; @@ -4002,12 +3900,6 @@ static int img_resize(int argc, char **argv) } filename =3D argv[optind++]; =20 - 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 '+': @@ -4187,12 +4079,7 @@ static int img_amend(int argc, char **argv) quiet =3D true; break; case OPTION_OBJECT: - opts =3D qemu_opts_parse_noisily(&qemu_object_opts, - optarg, true); - if (!opts) { - ret =3D -1; - goto out_no_progress; - } + qemu_img_object_parse(optarg, 1); break; case OPTION_IMAGE_OPTS: image_opts =3D true; @@ -4207,13 +4094,6 @@ static int img_amend(int argc, char **argv) error_exit("Must specify options (-o)"); } =20 - if (qemu_opts_foreach(&qemu_object_opts, - user_creatable_add_opts_foreach, - qemu_img_object_print_help, &error_fatal)) { - ret =3D -1; - goto out_no_progress; - } - if (quiet) { progress =3D false; } @@ -4672,7 +4552,6 @@ static int img_bitmap(int argc, char **argv) { Error *err =3D NULL; int c, ret =3D 1; - QemuOpts *opts =3D NULL; const char *fmt =3D NULL, *src_fmt =3D NULL, *src_filename =3D NULL; const char *filename, *bitmap; BlockBackend *blk =3D NULL, *src =3D NULL; @@ -4766,10 +4645,7 @@ static int img_bitmap(int argc, char **argv) merge =3D true; break; case OPTION_OBJECT: - opts =3D qemu_opts_parse_noisily(&qemu_object_opts, optarg, tr= ue); - if (!opts) { - goto out; - } + qemu_img_object_parse(optarg, 1); break; case OPTION_IMAGE_OPTS: image_opts =3D true; @@ -4777,12 +4653,6 @@ static int img_bitmap(int argc, char **argv) } } =20 - 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"); @@ -4878,7 +4748,6 @@ static int img_bitmap(int argc, char **argv) out: blk_unref(src); blk_unref(blk); - qemu_opts_del(opts); return ret; } =20 @@ -5040,10 +4909,7 @@ static int img_dd(int argc, char **argv) force_share =3D true; break; case OPTION_OBJECT: - if (!qemu_opts_parse_noisily(&qemu_object_opts, optarg, true))= { - ret =3D -1; - goto out; - } + qemu_img_object_parse(optarg, 1); break; case OPTION_IMAGE_OPTS: image_opts =3D true; @@ -5090,13 +4956,6 @@ static int img_dd(int argc, char **argv) goto out; } =20 - if (qemu_opts_foreach(&qemu_object_opts, - user_creatable_add_opts_foreach, - qemu_img_object_print_help, &error_fatal)) { - ret =3D -1; - goto out; - } - blk1 =3D img_open(image_opts, in.filename, fmt, 0, false, false, force_share); =20 @@ -5272,7 +5131,6 @@ static int img_measure(int argc, char **argv) char *snapshot_name =3D NULL; bool force_share =3D false; QemuOpts *opts =3D NULL; - QemuOpts *object_opts =3D NULL; QemuOpts *sn_opts =3D NULL; QemuOptsList *create_opts =3D NULL; bool image_opts =3D false; @@ -5317,11 +5175,7 @@ static int img_measure(int argc, char **argv) force_share =3D true; break; case OPTION_OBJECT: - object_opts =3D qemu_opts_parse_noisily(&qemu_object_opts, - optarg, true); - if (!object_opts) { - goto out; - } + qemu_img_object_parse(optarg, 1); break; case OPTION_IMAGE_OPTS: image_opts =3D true; @@ -5351,12 +5205,6 @@ static int img_measure(int argc, char **argv) } } =20 - 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; @@ -5444,7 +5292,6 @@ static int img_measure(int argc, char **argv) =20 out: qapi_free_BlockMeasureInfo(info); - qemu_opts_del(object_opts); qemu_opts_del(opts); qemu_opts_del(sn_opts); qemu_opts_free(create_opts); @@ -5496,7 +5343,6 @@ int main(int argc, char **argv) error_exit("Not enough arguments"); } =20 - qemu_add_opts(&qemu_object_opts); qemu_add_opts(&qemu_source_opts); qemu_add_opts(&qemu_trace_opts); =20 --=20 2.26.2