From nobody Thu May 2 22:28:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1507085549033722.0797768489718; Tue, 3 Oct 2017 19:52:29 -0700 (PDT) Received: from localhost ([::1]:32940 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dzZn7-0003Tf-JD for importer@patchew.org; Tue, 03 Oct 2017 22:52:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41799) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dzZlq-0002nG-Gj for qemu-devel@nongnu.org; Tue, 03 Oct 2017 22:50:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dzZlp-0005fW-3L for qemu-devel@nongnu.org; Tue, 03 Oct 2017 22:50:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47568) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dzZlo-0005eH-Qg for qemu-devel@nongnu.org; Tue, 03 Oct 2017 22:50:49 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C7EBC780C9 for ; Wed, 4 Oct 2017 02:50:47 +0000 (UTC) Received: from localhost (ovpn-116-2.gru2.redhat.com [10.97.116.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4573C5EE04; Wed, 4 Oct 2017 02:50:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C7EBC780C9 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=ehabkost@redhat.com From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 3 Oct 2017 23:50:42 -0300 Message-Id: <20171004025043.3788-2-ehabkost@redhat.com> In-Reply-To: <20171004025043.3788-1-ehabkost@redhat.com> References: <20171004025043.3788-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 04 Oct 2017 02:50:47 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 1/2] config: qemu_config_parse() return number of config groups X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Change qemu_config_parse() to return the number of config groups in success and -EINVAL on error. This will allow callers of qemu_config_parse() to check if something was really loaded from the config file. All existing callers of qemu_config_parse() and qemu_read_config_file() only check if the return value was negative, so the change shouldn't affect them. Reviewed-by: Markus Armbruster Reviewed-by: Eric Blake Signed-off-by: Eduardo Habkost --- Changes series v3 -> series v4: * (none) Changes v2 -> v3: * None (rebase only) Changes v1 -> v2: * Remove unnecessary translation of qemu_config_parse() erros to -EINVAL at block/blkdebug.c:read_config() * Suggsted-by: Markus Armbruster --- block/blkdebug.c | 1 - util/qemu-config.c | 15 +++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/block/blkdebug.c b/block/blkdebug.c index 46e53f2f09..dfdf9b91aa 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -244,7 +244,6 @@ static int read_config(BDRVBlkdebugState *s, const char= *filename, ret =3D qemu_config_parse(f, config_groups, filename); if (ret < 0) { error_setg(errp, "Could not parse blkdebug config file"); - ret =3D -EINVAL; goto fail; } } diff --git a/util/qemu-config.c b/util/qemu-config.c index 405dd1a1d7..99b0e46fa3 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -385,6 +385,7 @@ void qemu_config_write(FILE *fp) } } =20 +/* Returns number of config groups on success, -errno on error */ int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname) { char line[1024], group[64], id[64], arg[64], value[1024]; @@ -392,7 +393,8 @@ int qemu_config_parse(FILE *fp, QemuOptsList **lists, c= onst char *fname) QemuOptsList *list =3D NULL; Error *local_err =3D NULL; QemuOpts *opts =3D NULL; - int res =3D -1, lno =3D 0; + int res =3D -EINVAL, lno =3D 0; + int count =3D 0; =20 loc_push_none(&loc); while (fgets(line, sizeof(line), fp) !=3D NULL) { @@ -413,6 +415,7 @@ int qemu_config_parse(FILE *fp, QemuOptsList **lists, c= onst char *fname) goto out; } opts =3D qemu_opts_create(list, id, 1, NULL); + count++; continue; } if (sscanf(line, "[%63[^]]]", group) =3D=3D 1) { @@ -423,6 +426,7 @@ int qemu_config_parse(FILE *fp, QemuOptsList **lists, c= onst char *fname) goto out; } opts =3D qemu_opts_create(list, NULL, 0, &error_abort); + count++; continue; } value[0] =3D '\0'; @@ -447,7 +451,7 @@ int qemu_config_parse(FILE *fp, QemuOptsList **lists, c= onst char *fname) error_report("error reading file"); goto out; } - res =3D 0; + res =3D count; out: loc_pop(&loc); return res; @@ -464,12 +468,7 @@ int qemu_read_config_file(const char *filename) =20 ret =3D qemu_config_parse(f, vm_config_groups, filename); fclose(f); - - if (ret =3D=3D 0) { - return 0; - } else { - return -EINVAL; - } + return ret; } =20 static void config_parse_qdict_section(QDict *options, QemuOptsList *opts, --=20 2.13.5 From nobody Thu May 2 22:28:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1507085630919430.1797092494859; Tue, 3 Oct 2017 19:53:50 -0700 (PDT) Received: from localhost ([::1]:32943 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dzZoV-0004KW-3d for importer@patchew.org; Tue, 03 Oct 2017 22:53:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41817) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dzZlr-0002nQ-Rv for qemu-devel@nongnu.org; Tue, 03 Oct 2017 22:50:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dzZlq-0005i9-VC for qemu-devel@nongnu.org; Tue, 03 Oct 2017 22:50:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34930) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dzZlq-0005hG-Pb for qemu-devel@nongnu.org; Tue, 03 Oct 2017 22:50:50 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id C9846882FF for ; Wed, 4 Oct 2017 02:50:49 +0000 (UTC) Received: from localhost (ovpn-116-2.gru2.redhat.com [10.97.116.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 47BFF17CE7; Wed, 4 Oct 2017 02:50:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C9846882FF Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=ehabkost@redhat.com From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 3 Oct 2017 23:50:43 -0300 Message-Id: <20171004025043.3788-3-ehabkost@redhat.com> In-Reply-To: <20171004025043.3788-1-ehabkost@redhat.com> References: <20171004025043.3788-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 04 Oct 2017 02:50:49 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 2/2] vl: Deprecate auto-loading of qemu.conf X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In case there were options set in the default config file, print a warning so users can update their scripts. If somebody wants to keep the config file as-is, avoid the warning and use a command-line that will work in future QEMU versions, they can use: $QEMU -no-user-config -readconfig /etc/qemu/qemu.conf I was going to include the suggestion in the warning message, but I thought it could make it more confusing. The suggestion is documented in qemu-doc.texi. Signed-off-by: Eduardo Habkost --- Changes v3 -> v4: * Use warn_report() instead of error_report("warning: ...") (Eric Blake) * Document as a deprecated feature in qemu-doc.texi * Update subject line (was: "vl: Print warning when a default config file is loaded") Changes v2 -> v3: * Rebase (no code changes) * Commit message update: suggest -no-user-config --- vl.c | 6 ++++++ qemu-doc.texi | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/vl.c b/vl.c index 3fed457921..1b0ecdf74e 100644 --- a/vl.c +++ b/vl.c @@ -3066,6 +3066,12 @@ static int qemu_read_default_config_file(void) return ret; } =20 + if (ret > 0) { + loc_set_none(); + warn_report("Future QEMU versions won't load %s automatically", + CONFIG_QEMU_CONFDIR "/qemu.conf"); + } + return 0; } =20 diff --git a/qemu-doc.texi b/qemu-doc.texi index ecd186a159..a81a09d05c 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -2370,6 +2370,14 @@ they were first deprecated in the 2.10.0 release. What follows is a list of all features currently marked as deprecated. =20 +@section Automatic loading of @file{qemu.conf} (since 2.11.0) + +The automatic loading of an user-provided @file{qemu.conf} file from the Q= EMU +config directory is deprecated and behavior will change in future QEMU ver= sions. +To load an user-provided @file{qemu.conf} file and keep compatibility with +future versions, the arguments @samp{-no-user-config -readconfig +@var{CONFDIR}/qemu.conf} may be used. + @section System emulator command line arguments =20 @subsection -drive boot=3Don|off (since 1.3.0) --=20 2.13.5