From nobody Tue Feb 10 00:39:51 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=1606900679; cv=none; d=zohomail.com; s=zohoarc; b=jK32urNTFdBbdqO0nlaOtTt5i2KiOjixTRDT/ZjlHIOzG49dka+T2aqdPXC3qpXFB4T6i+tTfxCbrwwfaQNppWWru4/Aat9lC0lTuz/pMXTIbgD9oyUVchgIoJSh5+m3mWg8d1AX69dTmhr4+9RMx9pd5cXMdLqMKGC+8EsfxYE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606900679; h=Content-Type:Content-Transfer-Encoding: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=zgVoL3H0l+Hb60P23cylHjQiDNUjrl2fQXiQK1fD/HM=; b=ILxAMxXkQhECFetjQeZg7YUv3k7pVXyIpMKaoeTVOqYRHBWyw+R3/7dltbkZ2tNGoXZCnOzTndaHXTuUkwtEWZzVCGE3lBH2AreVOG2PwcYwIOEWZIfXbp9zJA5hpU1GRZjcyNY9b1zrd44lc0SNcKlV/wpCQC99vheUp4vczpA= 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 1606900679891307.14165328005504; Wed, 2 Dec 2020 01:17:59 -0800 (PST) Received: from localhost ([::1]:40570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkOGs-0004Uy-QO for importer@patchew.org; Wed, 02 Dec 2020 04:17:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkNDI-0003jY-Gw for qemu-devel@nongnu.org; Wed, 02 Dec 2020 03:10:12 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:23193) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kkNCW-0003nj-Fo for qemu-devel@nongnu.org; Wed, 02 Dec 2020 03:10:12 -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-22-Nt_Q-bdnPXSNdIIRlDRYUg-1; Wed, 02 Dec 2020 03:09:21 -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 43F1080364D for ; Wed, 2 Dec 2020 08:09:20 +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 101B760854 for ; Wed, 2 Dec 2020 08:09:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606896562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zgVoL3H0l+Hb60P23cylHjQiDNUjrl2fQXiQK1fD/HM=; b=hRWwrJz0YQAhbTydW99wLijd5H8ib9NmAjsZocXcq8VEt2XZHtlh2e+7fY00GBJ1LRNRiE v/lFszkjDzReqVLca36AzU8h7VGRp/VTEq5vnHsKifZc5EjDP5L5ENUj6Jjf7nkgPUP6oN ljslOtQHkRt2IZA2vn/8qoU/krJ7lEE= X-MC-Unique: Nt_Q-bdnPXSNdIIRlDRYUg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 081/113] config-file: move -set implementation to vl.c Date: Wed, 2 Dec 2020 03:08:17 -0500 Message-Id: <20201202080849.4125477-82-pbonzini@redhat.com> In-Reply-To: <20201202080849.4125477-1-pbonzini@redhat.com> References: <20201202080849.4125477-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-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.497, 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_H4=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: , 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" We want to make it independent of QemuOpts. Signed-off-by: Paolo Bonzini Signed-off-by: Paolo Bonzini --- include/qemu/config-file.h | 1 - softmmu/vl.c | 33 +++++++++++++++++++++++++++++++++ util/qemu-config.c | 33 --------------------------------- 3 files changed, 33 insertions(+), 34 deletions(-) diff --git a/include/qemu/config-file.h b/include/qemu/config-file.h index d74f920152..29226107bd 100644 --- a/include/qemu/config-file.h +++ b/include/qemu/config-file.h @@ -8,7 +8,6 @@ QemuOpts *qemu_find_opts_singleton(const char *group); =20 void qemu_add_opts(QemuOptsList *list); void qemu_add_drive_opts(QemuOptsList *list); -int qemu_set_option(const char *str); int qemu_global_option(const char *str); =20 void qemu_config_write(FILE *fp); diff --git a/softmmu/vl.c b/softmmu/vl.c index 77ee044c42..7146fbe219 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2797,6 +2797,39 @@ static int qemu_read_default_config_file(void) return 0; } =20 +static int qemu_set_option(const char *str) +{ + Error *local_err =3D NULL; + char group[64], id[64], arg[64]; + QemuOptsList *list; + QemuOpts *opts; + int rc, offset; + + rc =3D sscanf(str, "%63[^.].%63[^.].%63[^=3D]%n", group, id, arg, &off= set); + if (rc < 3 || str[offset] !=3D '=3D') { + error_report("can't parse: \"%s\"", str); + return -1; + } + + list =3D qemu_find_opts(group); + if (list =3D=3D NULL) { + return -1; + } + + opts =3D qemu_opts_find(list, id); + if (!opts) { + error_report("there is no %s \"%s\" defined", + list->name, id); + return -1; + } + + if (!qemu_opt_set(opts, arg, str + offset + 1, &local_err)) { + error_report_err(local_err); + return -1; + } + return 0; +} + static void user_register_global_props(void) { qemu_opts_foreach(qemu_find_opts("global"), diff --git a/util/qemu-config.c b/util/qemu-config.c index 660f47b005..725e3d7e4b 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -313,39 +313,6 @@ void qemu_add_opts(QemuOptsList *list) abort(); } =20 -int qemu_set_option(const char *str) -{ - Error *local_err =3D NULL; - char group[64], id[64], arg[64]; - QemuOptsList *list; - QemuOpts *opts; - int rc, offset; - - rc =3D sscanf(str, "%63[^.].%63[^.].%63[^=3D]%n", group, id, arg, &off= set); - if (rc < 3 || str[offset] !=3D '=3D') { - error_report("can't parse: \"%s\"", str); - return -1; - } - - list =3D qemu_find_opts(group); - if (list =3D=3D NULL) { - return -1; - } - - opts =3D qemu_opts_find(list, id); - if (!opts) { - error_report("there is no %s \"%s\" defined", - list->name, id); - return -1; - } - - if (!qemu_opt_set(opts, arg, str + offset + 1, &local_err)) { - error_report_err(local_err); - return -1; - } - return 0; -} - struct ConfigWriteData { QemuOptsList *list; FILE *fp; --=20 2.26.2