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=1593017127; cv=none; d=zohomail.com; s=zohoarc; b=OUipQcZ3N5FR4eH0jQnt9zBzb4hyjC0+GWwKJbbhXH5ARsYnPv5KquSb4Yw2taJDypTqQHBYQojotwcA0EpLflVUrCH4eFo5khviAiyK8lLHvhb66ZP5t1+6EfnJSPeKgPRmXghXBoFtLQkZR90jZbCGtFO9vsqimXEaRaveJyc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593017127; 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=pktL9AI4yzCoRsOgCmHscvSfQiJ6qHLUehFnntuUG+U=; b=iXfL3NvGuHIet6E5xvgxIfUJv4NTB21495PIipzulL4kDoPbPbFvKIx/ONftGWcxUSlnf+zlWI6QD8wBl9iup/sb/CzQRuXiLdOoadYajOjAwhF0Rb6MXBteOu7X187NPFg13Pz3bBgCwusQHObIDyyJaVj0IoF5le3gt0kSAmc= 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 1593017127893688.0806761143323; Wed, 24 Jun 2020 09:45:27 -0700 (PDT) Received: from localhost ([::1]:46912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jo8Wc-0005hf-KD for importer@patchew.org; Wed, 24 Jun 2020 12:45:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51412) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jo8VE-00030K-2e for qemu-devel@nongnu.org; Wed, 24 Jun 2020 12:44:00 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:58004 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 1jo8V7-00054G-5A for qemu-devel@nongnu.org; Wed, 24 Jun 2020 12:43:59 -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-498-LDmbJXX8M8mxHALDYLV91Q-1; Wed, 24 Jun 2020 12:43:50 -0400 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 2F2D418585A6; 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 F12185D9C5; Wed, 24 Jun 2020 16:43:48 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 156A7113847B; 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=1593017032; 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=pktL9AI4yzCoRsOgCmHscvSfQiJ6qHLUehFnntuUG+U=; b=LBaTxWixKkq0FeU06qjcjsSIoCiJ5x0UJKrCh2lwsLG8ZRfDhA4GqtB1YEM9Ik8iQAeMNj nCCZiHziqUT14Omz4Fd0s5WhJ4IiIHpKO0NtevF2DlqtUL3KKpcJF74Cs1QEwy7+vanJ0c GWs4vhPE3I9L7UtfwrcHiVtDpqLGuUY= X-MC-Unique: LDmbJXX8M8mxHALDYLV91Q-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 14/46] qemu-option: Factor out helper opt_create() Date: Wed, 24 Jun 2020 18:43:12 +0200 Message-Id: <20200624164344.3778251-15-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.79 on 10.5.11.14 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=205.139.110.61; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/24 00:34:35 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" There is just one use so far. The next commit will add more. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Vladimir Sementsov-Ogievskiy --- util/qemu-option.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/util/qemu-option.c b/util/qemu-option.c index d9293814b4..3cdf0c0800 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -502,6 +502,23 @@ int qemu_opt_unset(QemuOpts *opts, const char *name) } } =20 +static QemuOpt *opt_create(QemuOpts *opts, const char *name, char *value, + bool prepend) +{ + QemuOpt *opt =3D g_malloc0(sizeof(*opt)); + + opt->name =3D g_strdup(name); + opt->str =3D value; + opt->opts =3D opts; + if (prepend) { + QTAILQ_INSERT_HEAD(&opts->head, opt, next); + } else { + QTAILQ_INSERT_TAIL(&opts->head, opt, next); + } + + return opt; +} + static void opt_set(QemuOpts *opts, const char *name, char *value, bool prepend, bool *help_wanted, Error **errp) { @@ -519,16 +536,8 @@ static void opt_set(QemuOpts *opts, const char *name, = char *value, return; } =20 - opt =3D g_malloc0(sizeof(*opt)); - opt->name =3D g_strdup(name); - opt->opts =3D opts; - if (prepend) { - QTAILQ_INSERT_HEAD(&opts->head, opt, next); - } else { - QTAILQ_INSERT_TAIL(&opts->head, opt, next); - } + opt =3D opt_create(opts, name, value, prepend); opt->desc =3D desc; - opt->str =3D value; qemu_opt_parse(opt, &local_err); if (local_err) { error_propagate(errp, local_err); --=20 2.26.2