From nobody Mon Feb 9 22:38:16 2026 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=1604929365; cv=none; d=zohomail.com; s=zohoarc; b=EM2mVOvNDSnxFb+BqT4FFYxk6ITD0UjicX3HW3w9D9Vb386Phk/5EbU4XKY+ULe4OIf5Kj2IFuWumw+zGxPwgLNQF8BI2n768A8OijU95Bxcw5EOp2MPbvBeHwKUpuVflQCkSqoIvEnYdjtcQwWEhc/4SgUJdwsgp2ppSmjaQXY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604929365; 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=mCDwkoAWBs5TBvHw5DNhs4UXxWuEbUL+YWIMbOieb+c=; b=WcNCM1RuGLIioMaOw1Jxs7ccm+sDBD5yMeHk7edtNr0pL03V+/c6WYEVoFcdjTklokXUra8iD9vnUSgTF7faaXBTnaU4cEc8fXCP8yvTQgMJp8qpL48N5kOnxAKyjt65bq5PLmfJ3RNa5rMhvU6mIe5yeD2T3JcT/LnlOwKvafs= 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 1604929365199518.5732609897689; Mon, 9 Nov 2020 05:42:45 -0800 (PST) Received: from localhost ([::1]:60872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kc7RU-0007tU-1k for importer@patchew.org; Mon, 09 Nov 2020 08:42:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kc7OV-0004r6-RJ for qemu-devel@nongnu.org; Mon, 09 Nov 2020 08:39:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:44905) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kc7OS-0000iI-Ri for qemu-devel@nongnu.org; Mon, 09 Nov 2020 08:39:38 -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-500-QjgLzQqIPBWTVoahuYHA4w-1; Mon, 09 Nov 2020 08:39:34 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A7F5D809DC9 for ; Mon, 9 Nov 2020 13:39:33 +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 59F656EF40; Mon, 9 Nov 2020 13:39:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604929176; 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=mCDwkoAWBs5TBvHw5DNhs4UXxWuEbUL+YWIMbOieb+c=; b=iVb4idcJku6jGtKmJu8Vz8yt/jyQGAR5D6MVLc5ROV+M2qDarXkZqQmPK3eFojZjAWcI5Z 8WW224ARiEUPE4cnPH3ETcxbD52PPuMVFi7alkJXdpSy9Cvk5Ax4/h0L9xaAURjrp9Pz7v FqNTyr6gSqidhLg61WUAS5oSEMjSK5A= X-MC-Unique: QjgLzQqIPBWTVoahuYHA4w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH v2 3/6] qemu-option: restrict qemu_opts_set to merge-lists QemuOpts Date: Mon, 9 Nov 2020 08:39:28 -0500 Message-Id: <20201109133931.979563-4-pbonzini@redhat.com> In-Reply-To: <20201109133931.979563-1-pbonzini@redhat.com> References: <20201109133931.979563-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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-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/09 01:25:23 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: armbru@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" qemu_opts_set is used to create default network backends and to parse sugar options -kernel, -initrd, -append, -bios and -dtb. Switch the former to qemu_opts_parse, so that qemu_opts_set is now only used on merge-lists QemuOptsList (for which it makes the most sense indeed)... except in the testcase, which is changed to use a merge-list QemuOptsList. With this change we can remove the id parameter. With the parameter always NULL, we know that qemu_opts_create cannot fail and can pass &error_abort to it. Signed-off-by: Paolo Bonzini --- include/qemu/option.h | 3 +-- softmmu/vl.c | 19 +++++++------------ tests/test-qemu-opts.c | 24 +++++++++++++++++++++--- util/qemu-option.c | 9 +++------ 4 files changed, 32 insertions(+), 23 deletions(-) diff --git a/include/qemu/option.h b/include/qemu/option.h index ac69352e0e..f73e0dc7d9 100644 --- a/include/qemu/option.h +++ b/include/qemu/option.h @@ -119,8 +119,7 @@ QemuOpts *qemu_opts_create(QemuOptsList *list, const ch= ar *id, int fail_if_exists, Error **errp); void qemu_opts_reset(QemuOptsList *list); void qemu_opts_loc_restore(QemuOpts *opts); -bool qemu_opts_set(QemuOptsList *list, const char *id, - const char *name, const char *value, Error **errp); +bool qemu_opts_set(QemuOptsList *list, const char *name, const char *value= , Error **errp); const char *qemu_opts_id(QemuOpts *opts); void qemu_opts_set_id(QemuOpts *opts, char *id); void qemu_opts_del(QemuOpts *opts); diff --git a/softmmu/vl.c b/softmmu/vl.c index a71164494e..65607fe55e 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -3107,20 +3107,16 @@ void qemu_init(int argc, char **argv, char **envp) } break; case QEMU_OPTION_kernel: - qemu_opts_set(qemu_find_opts("machine"), NULL, "kernel", o= ptarg, - &error_abort); + qemu_opts_set(qemu_find_opts("machine"), "kernel", optarg,= &error_abort); break; case QEMU_OPTION_initrd: - qemu_opts_set(qemu_find_opts("machine"), NULL, "initrd", o= ptarg, - &error_abort); + qemu_opts_set(qemu_find_opts("machine"), "initrd", optarg,= &error_abort); break; case QEMU_OPTION_append: - qemu_opts_set(qemu_find_opts("machine"), NULL, "append", o= ptarg, - &error_abort); + qemu_opts_set(qemu_find_opts("machine"), "append", optarg,= &error_abort); break; case QEMU_OPTION_dtb: - qemu_opts_set(qemu_find_opts("machine"), NULL, "dtb", opta= rg, - &error_abort); + qemu_opts_set(qemu_find_opts("machine"), "dtb", optarg, &e= rror_abort); break; case QEMU_OPTION_cdrom: drive_add(IF_DEFAULT, 2, optarg, CDROM_OPTS); @@ -3230,8 +3226,7 @@ void qemu_init(int argc, char **argv, char **envp) } break; case QEMU_OPTION_bios: - qemu_opts_set(qemu_find_opts("machine"), NULL, "firmware",= optarg, - &error_abort); + qemu_opts_set(qemu_find_opts("machine"), "firmware", optar= g, &error_abort); break; case QEMU_OPTION_singlestep: singlestep =3D 1; @@ -4258,9 +4253,9 @@ void qemu_init(int argc, char **argv, char **envp) =20 if (default_net) { QemuOptsList *net =3D qemu_find_opts("net"); - qemu_opts_set(net, NULL, "type", "nic", &error_abort); + qemu_opts_parse(net, "nic", true, &error_abort); #ifdef CONFIG_SLIRP - qemu_opts_set(net, NULL, "type", "user", &error_abort); + qemu_opts_parse(net, "user", true, &error_abort); #endif } =20 diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c index 297ffe79dd..322b32871b 100644 --- a/tests/test-qemu-opts.c +++ b/tests/test-qemu-opts.c @@ -84,11 +84,25 @@ static QemuOptsList opts_list_03 =3D { }, }; =20 +static QemuOptsList opts_list_04 =3D { + .name =3D "opts_list_04", + .head =3D QTAILQ_HEAD_INITIALIZER(opts_list_04.head), + .merge_lists =3D true, + .desc =3D { + { + .name =3D "str3", + .type =3D QEMU_OPT_STRING, + }, + { /* end of list */ } + }, +}; + static void register_opts(void) { qemu_add_opts(&opts_list_01); qemu_add_opts(&opts_list_02); qemu_add_opts(&opts_list_03); + qemu_add_opts(&opts_list_04); } =20 static void test_find_unknown_opts(void) @@ -402,17 +416,21 @@ static void test_qemu_opts_set(void) QemuOpts *opts; const char *opt; =20 - list =3D qemu_find_opts("opts_list_01"); + list =3D qemu_find_opts("opts_list_04"); g_assert(list !=3D NULL); g_assert(QTAILQ_EMPTY(&list->head)); - g_assert_cmpstr(list->name, =3D=3D, "opts_list_01"); + g_assert_cmpstr(list->name, =3D=3D, "opts_list_04"); =20 /* should not find anything at this point */ opts =3D qemu_opts_find(list, NULL); g_assert(opts =3D=3D NULL); =20 /* implicitly create opts and set str3 value */ - qemu_opts_set(list, NULL, "str3", "value", &error_abort); + qemu_opts_set(list, "str3", "first_value", &error_abort); + g_assert(!QTAILQ_EMPTY(&list->head)); + + /* set it again */ + qemu_opts_set(list, "str3", "value", &error_abort); g_assert(!QTAILQ_EMPTY(&list->head)); =20 /* get the just created opts */ diff --git a/util/qemu-option.c b/util/qemu-option.c index 59be4f9d21..c88e159f18 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -665,15 +665,12 @@ void qemu_opts_loc_restore(QemuOpts *opts) loc_restore(&opts->loc); } =20 -bool qemu_opts_set(QemuOptsList *list, const char *id, - const char *name, const char *value, Error **errp) +bool qemu_opts_set(QemuOptsList *list, const char *name, const char *value= , Error **errp) { QemuOpts *opts; =20 - opts =3D qemu_opts_create(list, id, 1, errp); - if (!opts) { - return false; - } + assert(list->merge_lists); + opts =3D qemu_opts_create(list, NULL, 0, &error_abort); return qemu_opt_set(opts, name, value, errp); } =20 --=20 2.26.2