From nobody Fri Dec 19 17:51:27 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=1593017424; cv=none; d=zohomail.com; s=zohoarc; b=NfMqu1WpT352nteqe+tvugw9sFUqkRlN/vhnBPbrtjGRQd1bQmw9nQWuW1b0xKSTLw3ZPVJR7t3YFyb1g8oeCw208sfLZa/HvGtxhnpMG+hHUTT/ejgBzSPK7lk+CqvLRhE7H2NuxQ7j03WAyiqrAMHKnzyi0/MA2dYvomvozvY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593017424; 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=3Sh0UAY1+Hr4CyavGL5vHaBvy5U4c3TrBNo8FN91rFE=; b=W2i2MEh/ov9mSD+9NeUZf3+RgSF6k2hHL7/9faky06veRccQf2biFj+OU4lXvMHHCuBU9jWOj55ILszjWSnRsxtEfwHYIr2nG9hSGwzNL1TCRjg5k4I35fSfvUaA4kXwzff5r24Ku6dEnwtDkZL53qTIk3iox87JOugTH7R/i+Y= 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 159301742439882.00543219065264; Wed, 24 Jun 2020 09:50:24 -0700 (PDT) Received: from localhost ([::1]:36034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jo8bO-0005NX-Od for importer@patchew.org; Wed, 24 Jun 2020 12:50:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jo8VJ-0003HJ-8U for qemu-devel@nongnu.org; Wed, 24 Jun 2020 12:44:05 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:30111 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 1jo8V9-000558-Az for qemu-devel@nongnu.org; Wed, 24 Jun 2020 12:44:04 -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-235-UM1UQfI_OIyGk9wsuP1Ksg-1; Wed, 24 Jun 2020 12:43:50 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 36CBE8015F6; Wed, 24 Jun 2020 16:43:49 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-121.ams2.redhat.com [10.36.112.121]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EF60B1A90F; Wed, 24 Jun 2020 16:43:48 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 11C95113847A; Wed, 24 Jun 2020 18:43:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593017033; 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=3Sh0UAY1+Hr4CyavGL5vHaBvy5U4c3TrBNo8FN91rFE=; b=VlMTnisL8MS7RFbOKnq9yZpDrLGIKM+LlzdCfQaLC4bUUH6ij7PWcOjO5Ac1JG3wH/iJnu Ldkhbc5glwhpIqbLg8dmhw5odxQ3pmDVblwf41hY1BNM+fSdSx/44UjOYT0mois99oKOh6 0I5NpztbRBH/y/VsRK2KtnHRbbBTZEg= X-MC-Unique: UM1UQfI_OIyGk9wsuP1Ksg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 13/46] qemu-option: Simplify around find_default_by_name() Date: Wed, 24 Jun 2020 18:43:11 +0200 Message-Id: <20200624164344.3778251-14-armbru@redhat.com> In-Reply-To: <20200624164344.3778251-1-armbru@redhat.com> References: <20200624164344.3778251-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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/06/24 02:33:25 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, 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 --- util/qemu-option.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/util/qemu-option.c b/util/qemu-option.c index ddcf3072c5..d9293814b4 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -286,11 +286,9 @@ const char *qemu_opt_get(QemuOpts *opts, const char *n= ame) 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 def_val; } - return opt ? opt->str : NULL; + return opt->str; } =20 void qemu_opt_iter_init(QemuOptsIter *iter, QemuOpts *opts, const char *na= me) @@ -320,7 +318,7 @@ 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; @@ -329,10 +327,7 @@ char *qemu_opt_get_del(QemuOpts *opts, const char *nam= e) 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(def_val); } str =3D opt->str; opt->str =3D NULL; --=20 2.26.2