From nobody Fri Dec 19 19:15:38 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594244150; cv=none; d=zohomail.com; s=zohoarc; b=marpR6bfkXlJq9F1SvyU0Asp/Bh1B62B0eA+QFQtzq3Vre+qDQro3XXYAbuluanTgIx//iX2jnr1225Nu2g0BRZqEiBgRkZks7HrL5h6y5tSoHJb7qKk7BvuAHkQnrDkbIUfXx2xT9r9Jomk8Jqi2AiHN61j9UNLN06d6Bfi9FY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594244150; 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=A2RoCCvKMEUJs8Z9t1M7vECuNMh4EUVbdT+Fsvj4Ark=; b=WdXxIvSOPdb1uIGXTtLmtfHAvl1ivwQ3FrvU5m7QEJzBi6XhIU7aKK4/lke6WI8hlnzj/Ljw/W/uJFluSjx5kUu0g16jpLkDc11X3pPDYemY9SnLSS6qw7CwxuinonCSOwkelaOWWpZ6LhFW0DdoMC4+d/J9TELXJ0/25wEEYlQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 159424415080463.22772209268055; Wed, 8 Jul 2020 14:35:50 -0700 (PDT) Received: from localhost ([::1]:50396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtHjJ-0001qh-Db for importer@patchew.org; Wed, 08 Jul 2020 17:35:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33978) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtHbM-0007lc-UR for qemu-devel@nongnu.org; Wed, 08 Jul 2020 17:27:36 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:60985 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jtHbK-00022J-Q1 for qemu-devel@nongnu.org; Wed, 08 Jul 2020 17:27:36 -0400 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-137-42hJcmjmPeuUGXv80_irZQ-1; Tue, 07 Jul 2020 17:25:10 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 86D76100CCC0; Tue, 7 Jul 2020 21:25:09 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-143.ams2.redhat.com [10.36.112.143]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D6F7510013C2; Tue, 7 Jul 2020 21:25:07 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D743911326F3; Tue, 7 Jul 2020 23:25:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594243654; 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=A2RoCCvKMEUJs8Z9t1M7vECuNMh4EUVbdT+Fsvj4Ark=; b=VPHzjB3iXSGQImlZI4uUY0mzo9LEWPcM26PrLOUieoabDmnXs9gIQcuYW2ZfghjYaglbk7 wvxMymdKc3fi4nbwMGs/BVbY3Jw21KftaVxFfYVkQ5+hv16vBQPik38n78NzlhXBMVQmK3 tudpjs4OMLxBNkw5g+wxxrAXAQQtqLY= X-MC-Unique: 42hJcmjmPeuUGXv80_irZQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 08/53] qemu-option: Make uses of find_desc_by_name() more similar Date: Tue, 7 Jul 2020 23:24:18 +0200 Message-Id: <20200707212503.1495927-9-armbru@redhat.com> In-Reply-To: <20200707212503.1495927-1-armbru@redhat.com> References: <20200707212503.1495927-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@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=207.211.31.120; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/07 17:25:10 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: Vladimir Sementsov-Ogievskiy , Greg Kurz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This is to make the next commit easier to review. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Greg Kurz Message-Id: <20200707160613.848843-9-armbru@redhat.com> --- util/qemu-option.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/util/qemu-option.c b/util/qemu-option.c index fd1fd23521..1df55bc881 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -270,6 +270,7 @@ static void qemu_opt_del_all(QemuOpts *opts, const char= *name) const char *qemu_opt_get(QemuOpts *opts, const char *name) { QemuOpt *opt; + const QemuOptDesc *desc; =20 if (opts =3D=3D NULL) { return NULL; @@ -277,7 +278,7 @@ const char *qemu_opt_get(QemuOpts *opts, const char *na= me) =20 opt =3D qemu_opt_find(opts, name); if (!opt) { - const QemuOptDesc *desc =3D find_desc_by_name(opts->list->desc, na= me); + desc =3D find_desc_by_name(opts->list->desc, name); if (desc && desc->def_value_str) { return desc->def_value_str; } @@ -348,6 +349,7 @@ static bool qemu_opt_get_bool_helper(QemuOpts *opts, co= nst char *name, bool defval, bool del) { QemuOpt *opt; + const QemuOptDesc *desc; bool ret =3D defval; =20 if (opts =3D=3D NULL) { @@ -356,7 +358,7 @@ static bool qemu_opt_get_bool_helper(QemuOpts *opts, co= nst char *name, =20 opt =3D qemu_opt_find(opts, name); if (opt =3D=3D NULL) { - const QemuOptDesc *desc =3D find_desc_by_name(opts->list->desc, na= me); + desc =3D find_desc_by_name(opts->list->desc, name); if (desc && desc->def_value_str) { parse_option_bool(name, desc->def_value_str, &ret, &error_abor= t); } @@ -384,6 +386,7 @@ static uint64_t qemu_opt_get_number_helper(QemuOpts *op= ts, const char *name, uint64_t defval, bool del) { QemuOpt *opt; + const QemuOptDesc *desc; uint64_t ret =3D defval; =20 if (opts =3D=3D NULL) { @@ -392,7 +395,7 @@ static uint64_t qemu_opt_get_number_helper(QemuOpts *op= ts, const char *name, =20 opt =3D qemu_opt_find(opts, name); if (opt =3D=3D NULL) { - const QemuOptDesc *desc =3D find_desc_by_name(opts->list->desc, na= me); + desc =3D find_desc_by_name(opts->list->desc, name); if (desc && desc->def_value_str) { parse_option_number(name, desc->def_value_str, &ret, &error_ab= ort); } @@ -421,6 +424,7 @@ static uint64_t qemu_opt_get_size_helper(QemuOpts *opts= , const char *name, uint64_t defval, bool del) { QemuOpt *opt; + const QemuOptDesc *desc; uint64_t ret =3D defval; =20 if (opts =3D=3D NULL) { @@ -429,7 +433,7 @@ static uint64_t qemu_opt_get_size_helper(QemuOpts *opts= , const char *name, =20 opt =3D qemu_opt_find(opts, name); if (opt =3D=3D NULL) { - const QemuOptDesc *desc =3D find_desc_by_name(opts->list->desc, na= me); + desc =3D find_desc_by_name(opts->list->desc, name); if (desc && desc->def_value_str) { parse_option_size(name, desc->def_value_str, &ret, &error_abor= t); } @@ -540,18 +544,18 @@ void qemu_opt_set_bool(QemuOpts *opts, const char *na= me, bool val, Error **errp) { QemuOpt *opt; - const QemuOptDesc *desc =3D opts->list->desc; + const QemuOptDesc *desc; =20 - opt =3D g_malloc0(sizeof(*opt)); - opt->desc =3D find_desc_by_name(desc, name); - if (!opt->desc && !opts_accepts_any(opts)) { + desc =3D find_desc_by_name(opts->list->desc, name); + if (!desc && !opts_accepts_any(opts)) { error_setg(errp, QERR_INVALID_PARAMETER, name); - g_free(opt); return; } =20 + opt =3D g_malloc0(sizeof(*opt)); opt->name =3D g_strdup(name); opt->opts =3D opts; + opt->desc =3D desc; opt->value.boolean =3D !!val; opt->str =3D g_strdup(val ? "on" : "off"); QTAILQ_INSERT_TAIL(&opts->head, opt, next); @@ -561,18 +565,18 @@ void qemu_opt_set_number(QemuOpts *opts, const char *= name, int64_t val, Error **errp) { QemuOpt *opt; - const QemuOptDesc *desc =3D opts->list->desc; + const QemuOptDesc *desc; =20 - opt =3D g_malloc0(sizeof(*opt)); - opt->desc =3D find_desc_by_name(desc, name); - if (!opt->desc && !opts_accepts_any(opts)) { + desc =3D find_desc_by_name(opts->list->desc, name); + if (!desc && !opts_accepts_any(opts)) { error_setg(errp, QERR_INVALID_PARAMETER, name); - g_free(opt); return; } =20 + opt =3D g_malloc0(sizeof(*opt)); opt->name =3D g_strdup(name); opt->opts =3D opts; + opt->desc =3D desc; opt->value.uint =3D val; opt->str =3D g_strdup_printf("%" PRId64, val); QTAILQ_INSERT_TAIL(&opts->head, opt, next); --=20 2.26.2