From nobody Mon Feb 9 18:44:00 2026 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=1594138417; cv=none; d=zohomail.com; s=zohoarc; b=HATlz5tdqD3g5xpmUy2BjP3HrR/gVBLcth7PzV1xVGi9+SVjBzLZUWHNP6Dnuke3/07OUXc6ijdExtLmuT6/ctZM11IeTLmdHYfCS8eS9Gb7ciwvz2c3JmDDF0AgLlqXgH4Bn3eR/pCtQ2oXEjDoRjqkt/m5ZT0cZfIbK4P8A1I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594138417; 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=KHMn5I1RFKg3+jBpgffrwvUDe1QNVNMfFvqwt1B/NqU=; b=ehwxLDatrCDvLHznFfJgbKwhOQef+LcGzqna1NS55lZA7ZIgUz0zsy4S2oZ8owAGcNx+9lMicABaPGYSKnUBSTDrYww1lJMSjDkwTTvFcP1CmzvNr2y8qFgCanPfTLbgv8QeXrjA1zpmkczS+z0QlalHV+0mC+gcDy7AvviqkRQ= 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 1594138417591113.33963930789719; Tue, 7 Jul 2020 09:13:37 -0700 (PDT) Received: from localhost ([::1]:42472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsqDw-0007ML-0d for importer@patchew.org; Tue, 07 Jul 2020 12:13:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59360) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsq76-0001oF-Vc for qemu-devel@nongnu.org; Tue, 07 Jul 2020 12:06:33 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:52291 helo=us-smtp-delivery-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 1jsq70-0006n4-Jp for qemu-devel@nongnu.org; Tue, 07 Jul 2020 12:06:32 -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-41-Kh5k62FdONm6sYjFUPXHKQ-1; Tue, 07 Jul 2020 12:06:24 -0400 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 1A64B18829C6; Tue, 7 Jul 2020 16:06:23 +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 D8C0360CC0; Tue, 7 Jul 2020 16:06:22 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9445B112FB79; Tue, 7 Jul 2020 18:06:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594137985; 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=KHMn5I1RFKg3+jBpgffrwvUDe1QNVNMfFvqwt1B/NqU=; b=KsiVUxhNwUt+/0aVxJPobZrBs8CAv3fEJ7KvdHFzz4QulTXCTB/uSY2GQuE2eM8NVmiZQi YsrSiD1geITrciAr7t4zG8TIq4oNkhq56K8zIr5uTztdHTDZFLNbBni4ycjyNZnJcuq8eK JdMlTXxweFqI/pkA3KjWQSVk5ChcT2g= X-MC-Unique: Kh5k62FdONm6sYjFUPXHKQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH v4 10/45] qemu-option: Simplify around find_default_by_name() Date: Tue, 7 Jul 2020 18:05:38 +0200 Message-Id: <20200707160613.848843-11-armbru@redhat.com> In-Reply-To: <20200707160613.848843-1-armbru@redhat.com> References: <20200707160613.848843-1-armbru@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=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.81; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/07 00:20:54 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: peter.maydell@linaro.org, vsementsov@virtuozzo.com, berrange@redhat.com, ehabkost@redhat.com, qemu-block@nongnu.org, groug@kaod.org, pbonzini@redhat.com 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" Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Greg Kurz --- util/qemu-option.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/util/qemu-option.c b/util/qemu-option.c index 14e211ddd8..e7b540a21b 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -277,7 +277,6 @@ static void qemu_opt_del_all(QemuOpts *opts, const char= *name) const char *qemu_opt_get(QemuOpts *opts, const char *name) { QemuOpt *opt; - const char *def_val; =20 if (opts =3D=3D NULL) { return NULL; @@ -285,12 +284,10 @@ const char *qemu_opt_get(QemuOpts *opts, const char *= name) =20 opt =3D qemu_opt_find(opts, name); if (!opt) { - def_val =3D find_default_by_name(opts, name); - if (def_val) { - return def_val; - } + return find_default_by_name(opts, name); } - return opt ? opt->str : NULL; + + return opt->str; } =20 void qemu_opt_iter_init(QemuOptsIter *iter, QemuOpts *opts, const char *na= me) @@ -319,8 +316,7 @@ const char *qemu_opt_iter_next(QemuOptsIter *iter) char *qemu_opt_get_del(QemuOpts *opts, const char *name) { QemuOpt *opt; - const char *def_val; - char *str =3D NULL; + char *str; =20 if (opts =3D=3D NULL) { return NULL; @@ -328,11 +324,7 @@ char *qemu_opt_get_del(QemuOpts *opts, const char *nam= e) =20 opt =3D qemu_opt_find(opts, name); if (!opt) { - def_val =3D find_default_by_name(opts, name); - if (def_val) { - str =3D g_strdup(def_val); - } - return str; + return g_strdup(find_default_by_name(opts, name)); } str =3D opt->str; opt->str =3D NULL; --=20 2.26.2