From nobody Mon Nov 17 13:59:35 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=1604490671; cv=none; d=zohomail.com; s=zohoarc; b=ffGrtMznaSTGVj7cQPV3cD0lyu4GAVcODAPI84QZlkWp4IYxjJ/TPHDLEXmSBu7ltRnFU5Ts07+lIpWQKHDxTwHNF/+iuTA1jxVukLdWSYBUurouFQJH+JgG61jn5Pktne9ErYw2NNjsdijR+peBmVVSRd2iDGM3jjgnfZbY/4o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604490671; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=FrbWX5TvokkOxyal1wc2ef3gbLipin32PLSm525RtC8=; b=bjd+OZv1FGBf8mjFRtcm/IMpGkazWDCSektZQ+biegf3Yc3mW4kRwFar+N67gHVHtTNDoKu+Vzy+pe+AAf6ZzUQOzueu0V/34OBHTYwREFcG7efwFNzl7NKz99D6tDR3fUTZxeLoVlKneIOFZOLWC50m5VtbEdEtmmcJv/t5ygE= 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 1604490671704433.6794675985451; Wed, 4 Nov 2020 03:51:11 -0800 (PST) Received: from localhost ([::1]:44626 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaHJm-00046n-K8 for importer@patchew.org; Wed, 04 Nov 2020 06:51:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaHIQ-0003C8-Au for qemu-devel@nongnu.org; Wed, 04 Nov 2020 06:49:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:23929) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaHIO-0004Ly-2i for qemu-devel@nongnu.org; Wed, 04 Nov 2020 06:49:46 -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-44-GQ59zPxyPQyh5CRljL8wKg-1; Wed, 04 Nov 2020 06:49:39 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B159A809DDB for ; Wed, 4 Nov 2020 11:49:38 +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 3E6235D9CC; Wed, 4 Nov 2020 11:49:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604490583; 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; bh=FrbWX5TvokkOxyal1wc2ef3gbLipin32PLSm525RtC8=; b=ROTcPaEKxnUXlILsVPXUHMQcyUTRbHa5yqCThCIcCZk3a2Ao0sf5ddp+OwuRPYAqO2pi4v R0rTLVnb2tRw+N2I1njt8Dsjhqwxm7EPimxUwRRxRVTRVACNBmdVv4JSBFrIthtdhRHPyW TsnVjL+RllwdPzRkyondvODj3emSMh0= X-MC-Unique: GQ59zPxyPQyh5CRljL8wKg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH] qapi, qemu-options: make all parsing visitors parse boolean options the same Date: Wed, 4 Nov 2020 06:49:37 -0500 Message-Id: <20201104114937.520288-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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-Type: text/plain; charset="utf-8" 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/03 22:09:52 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: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) OptsVisitor, StringInputVisitor and the keyval visitor have three different ideas of how a human could write the value of a boolean option. Pay homage to the backwards-compatibility gods and make the new common helper accept all four sets (on/off, true/false, y/n and yes/no), but remove case-insensitivity. Since OptsVisitor is supposed to match qemu-options, adjust it as well. Signed-off-by: Paolo Bonzini Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Markus Armbruster Message-Id: <20201103161339.447118-1-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini Tested-by: Markus Armbruster --- include/qapi/util.h | 2 ++ qapi/opts-visitor.c | 14 +------------- qapi/qapi-util.c | 23 +++++++++++++++++++++++ qapi/qobject-input-visitor.c | 6 +----- qapi/string-input-visitor.c | 17 +---------------- tests/qemu-iotests/051.out | 6 +++--- tests/qemu-iotests/051.pc.out | 6 +++--- tests/qemu-iotests/133.out | 8 ++++---- tests/qemu-iotests/137.out | 4 ++-- util/qemu-option.c | 20 ++------------------ 10 files changed, 42 insertions(+), 64 deletions(-) diff --git a/include/qapi/util.h b/include/qapi/util.h index bc312e90aa..6178e98e97 100644 --- a/include/qapi/util.h +++ b/include/qapi/util.h @@ -19,6 +19,8 @@ typedef struct QEnumLookup { const char *qapi_enum_lookup(const QEnumLookup *lookup, int val); int qapi_enum_parse(const QEnumLookup *lookup, const char *buf, int def, Error **errp); +bool qapi_bool_parse(const char *name, const char *value, bool *obj, + Error **errp); =20 int parse_qapi_name(const char *name, bool complete); =20 diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c index 7781c23a42..587f31baf6 100644 --- a/qapi/opts-visitor.c +++ b/qapi/opts-visitor.c @@ -368,7 +368,6 @@ opts_type_str(Visitor *v, const char *name, char **obj,= Error **errp) } =20 =20 -/* mimics qemu-option.c::parse_option_bool() */ static bool opts_type_bool(Visitor *v, const char *name, bool *obj, Error **errp) { @@ -379,19 +378,8 @@ opts_type_bool(Visitor *v, const char *name, bool *obj= , Error **errp) if (!opt) { return false; } - if (opt->str) { - if (strcmp(opt->str, "on") =3D=3D 0 || - strcmp(opt->str, "yes") =3D=3D 0 || - strcmp(opt->str, "y") =3D=3D 0) { - *obj =3D true; - } else if (strcmp(opt->str, "off") =3D=3D 0 || - strcmp(opt->str, "no") =3D=3D 0 || - strcmp(opt->str, "n") =3D=3D 0) { - *obj =3D false; - } else { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, opt->name, - "on|yes|y|off|no|n"); + if (!qapi_bool_parse(opt->name, opt->str, obj, errp)) { return false; } } else { diff --git a/qapi/qapi-util.c b/qapi/qapi-util.c index 29a6c98b53..dfc0bde497 100644 --- a/qapi/qapi-util.c +++ b/qapi/qapi-util.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/ctype.h" +#include "qapi/qmp/qerror.h" =20 const char *qapi_enum_lookup(const QEnumLookup *lookup, int val) { @@ -40,6 +41,28 @@ int qapi_enum_parse(const QEnumLookup *lookup, const cha= r *buf, return def; } =20 +bool qapi_bool_parse(const char *name, const char *value, bool *obj, Error= **errp) +{ + if (g_str_equal(value, "on") || + g_str_equal(value, "yes") || + g_str_equal(value, "true") || + g_str_equal(value, "y")) { + *obj =3D true; + return true; + } + if (g_str_equal(value, "off") || + g_str_equal(value, "no") || + g_str_equal(value, "false") || + g_str_equal(value, "n")) { + *obj =3D false; + return true; + } + + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name, + "boolean (on/off)"); + return false; +} + /* * Parse a valid QAPI name from @str. * A valid name consists of letters, digits, hyphen and underscore. diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c index 7b184b50a7..23843b242e 100644 --- a/qapi/qobject-input-visitor.c +++ b/qapi/qobject-input-visitor.c @@ -512,11 +512,7 @@ static bool qobject_input_type_bool_keyval(Visitor *v,= const char *name, return false; } =20 - if (!strcmp(str, "on")) { - *obj =3D true; - } else if (!strcmp(str, "off")) { - *obj =3D false; - } else { + if (!qapi_bool_parse(name, str, obj, NULL)) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, full_name(qiv, name), "'on' or 'off'"); return false; diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c index 6e53396ea3..197139c1c0 100644 --- a/qapi/string-input-visitor.c +++ b/qapi/string-input-visitor.c @@ -332,22 +332,7 @@ static bool parse_type_bool(Visitor *v, const char *na= me, bool *obj, StringInputVisitor *siv =3D to_siv(v); =20 assert(siv->lm =3D=3D LM_NONE); - if (!strcasecmp(siv->string, "on") || - !strcasecmp(siv->string, "yes") || - !strcasecmp(siv->string, "true")) { - *obj =3D true; - return true; - } - if (!strcasecmp(siv->string, "off") || - !strcasecmp(siv->string, "no") || - !strcasecmp(siv->string, "false")) { - *obj =3D false; - return true; - } - - error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null", - "boolean"); - return false; + return qapi_bool_parse(name ? name : "null", siv->string, obj, errp); } =20 static bool parse_type_str(Visitor *v, const char *name, char **obj, diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out index de4771bcb3..21d2dbec4c 100644 --- a/tests/qemu-iotests/051.out +++ b/tests/qemu-iotests/051.out @@ -110,13 +110,13 @@ QEMU X.Y.Z monitor - type 'help' for more information (qemu) quit =20 Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D -QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= : Parameter 'lazy-refcounts' expects 'on' or 'off' +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= : Parameter 'lazy-refcounts' expects boolean (on/off) =20 Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D42 -QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= 42: Parameter 'lazy-refcounts' expects 'on' or 'off' +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= 42: Parameter 'lazy-refcounts' expects boolean (on/off) =20 Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3Dfoo -QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= foo: Parameter 'lazy-refcounts' expects 'on' or 'off' +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= foo: Parameter 'lazy-refcounts' expects boolean (on/off) =20 =20 =3D=3D=3D With version 2 images enabling lazy refcounts must fail =3D=3D= =3D diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out index f707471fb0..d814b83871 100644 --- a/tests/qemu-iotests/051.pc.out +++ b/tests/qemu-iotests/051.pc.out @@ -110,13 +110,13 @@ QEMU X.Y.Z monitor - type 'help' for more information (qemu) quit =20 Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D -QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= : Parameter 'lazy-refcounts' expects 'on' or 'off' +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= : Parameter 'lazy-refcounts' expects boolean (on/off) =20 Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D42 -QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= 42: Parameter 'lazy-refcounts' expects 'on' or 'off' +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= 42: Parameter 'lazy-refcounts' expects boolean (on/off) =20 Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3Dfoo -QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= foo: Parameter 'lazy-refcounts' expects 'on' or 'off' +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= foo: Parameter 'lazy-refcounts' expects boolean (on/off) =20 =20 =3D=3D=3D With version 2 images enabling lazy refcounts must fail =3D=3D= =3D diff --git a/tests/qemu-iotests/133.out b/tests/qemu-iotests/133.out index d70c2e8041..75431c2594 100644 --- a/tests/qemu-iotests/133.out +++ b/tests/qemu-iotests/133.out @@ -35,8 +35,8 @@ qemu-io: Cannot set both -c and the cache options =20 =3D=3D=3D Check that invalid options are handled correctly =3D=3D=3D =20 -qemu-io: Parameter 'read-only' expects 'on' or 'off' -qemu-io: Parameter 'cache.no-flush' expects 'on' or 'off' -qemu-io: Parameter 'cache.direct' expects 'on' or 'off' -qemu-io: Parameter 'auto-read-only' expects 'on' or 'off' +qemu-io: Parameter 'read-only' expects boolean (on/off) +qemu-io: Parameter 'cache.no-flush' expects boolean (on/off) +qemu-io: Parameter 'cache.direct' expects boolean (on/off) +qemu-io: Parameter 'auto-read-only' expects boolean (on/off) *** done diff --git a/tests/qemu-iotests/137.out b/tests/qemu-iotests/137.out index 86377c80cd..a420db61d5 100644 --- a/tests/qemu-iotests/137.out +++ b/tests/qemu-iotests/137.out @@ -15,7 +15,7 @@ read 33554432/33554432 bytes at offset 0 =20 =3D=3D=3D Try setting some invalid values =3D=3D=3D =20 -qemu-io: Parameter 'lazy-refcounts' expects 'on' or 'off' +qemu-io: Parameter 'lazy-refcounts' expects boolean (on/off) qemu-io: cache-size, l2-cache-size and refcount-cache-size may not be set = at the same time qemu-io: l2-cache-size may not exceed cache-size qemu-io: refcount-cache-size may not exceed cache-size @@ -38,7 +38,7 @@ wrote 512/512 bytes at offset 0 ./common.rc: Killed ( VALGRIND_QEMU=3D"${VALGRIND_QEMU_IO= }" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@"= ) OK: Dirty bit not set Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 -qemu-io: Parameter 'lazy-refcounts' expects 'on' or 'off' +qemu-io: Parameter 'lazy-refcounts' expects boolean (on/off) qcow2: Marking image as corrupt: Preventing invalid allocation of L2 table= at offset 0; further corruption events will be suppressed write failed: Input/output error *** done diff --git a/util/qemu-option.c b/util/qemu-option.c index b9f93a7f8b..acefbc23fa 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -96,21 +96,6 @@ const char *get_opt_value(const char *p, char **value) return offset; } =20 -static bool parse_option_bool(const char *name, const char *value, bool *r= et, - Error **errp) -{ - if (!strcmp(value, "on")) { - *ret =3D 1; - } else if (!strcmp(value, "off")) { - *ret =3D 0; - } else { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, - name, "'on' or 'off'"); - return false; - } - return true; -} - static bool parse_option_number(const char *name, const char *value, uint64_t *ret, Error **errp) { @@ -363,7 +348,7 @@ static bool qemu_opt_get_bool_helper(QemuOpts *opts, co= nst char *name, if (opt =3D=3D NULL) { def_val =3D find_default_by_name(opts, name); if (def_val) { - parse_option_bool(name, def_val, &ret, &error_abort); + qapi_bool_parse(name, def_val, &ret, &error_abort); } return ret; } @@ -471,8 +456,7 @@ static bool qemu_opt_parse(QemuOpt *opt, Error **errp) /* nothing */ return true; case QEMU_OPT_BOOL: - return parse_option_bool(opt->name, opt->str, &opt->value.boolean, - errp); + return qapi_bool_parse(opt->name, opt->str, &opt->value.boolean, e= rrp); case QEMU_OPT_NUMBER: return parse_option_number(opt->name, opt->str, &opt->value.uint, errp); --=20 2.26.2