From nobody Thu May 2 17:26:16 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 1506544448905656.4083331978718; Wed, 27 Sep 2017 13:34:08 -0700 (PDT) Received: from localhost ([::1]:56246 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dxJ1t-0006NO-Dv for importer@patchew.org; Wed, 27 Sep 2017 16:34:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dxJ0U-0005mD-Jw for qemu-devel@nongnu.org; Wed, 27 Sep 2017 16:32:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dxJ0T-0007VZ-Ry for qemu-devel@nongnu.org; Wed, 27 Sep 2017 16:32:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13022) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dxJ0T-0007VH-LU for qemu-devel@nongnu.org; Wed, 27 Sep 2017 16:32:33 -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 803D210C327 for ; Wed, 27 Sep 2017 20:32:32 +0000 (UTC) Received: from localhost (ovpn-116-18.gru2.redhat.com [10.97.116.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 181698F3BB; Wed, 27 Sep 2017 20:32:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 803D210C327 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: Wed, 27 Sep 2017 17:32:24 -0300 Message-Id: <20170927203225.30896-2-ehabkost@redhat.com> In-Reply-To: <20170927203225.30896-1-ehabkost@redhat.com> References: <20170927203225.30896-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, 27 Sep 2017 20:32:32 +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 1/2] vl: Eliminate defconfig variable 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" Both -nodefconfig and -no-user-config options do the same thing today, we only need one variable to keep track of them. Suggested-by: Markus Armbruster Signed-off-by: Eduardo Habkost Acked-by: Alistair Francis Reviewed-by: Markus Armbruster --- vl.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/vl.c b/vl.c index 4fd01fda91..b347a97a5b 100644 --- a/vl.c +++ b/vl.c @@ -3093,7 +3093,6 @@ int main(int argc, char **argv, char **envp) const char *qtest_log =3D NULL; const char *pid_file =3D NULL; const char *incoming =3D NULL; - bool defconfig =3D true; bool userconfig =3D true; bool nographic =3D false; DisplayType display_type =3D DT_DEFAULT; @@ -3194,8 +3193,6 @@ int main(int argc, char **argv, char **envp) popt =3D lookup_opt(argc, argv, &optarg, &optind); switch (popt->index) { case QEMU_OPTION_nodefconfig: - defconfig =3D false; - break; case QEMU_OPTION_nouserconfig: userconfig =3D false; break; @@ -3203,7 +3200,7 @@ int main(int argc, char **argv, char **envp) } } =20 - if (defconfig && userconfig) { + if (userconfig) { if (qemu_read_default_config_file() < 0) { exit(1); } --=20 2.13.5 From nobody Thu May 2 17:26:16 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) 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 1506544554395803.9826547024785; Wed, 27 Sep 2017 13:35:54 -0700 (PDT) Received: from localhost ([::1]:56257 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dxJ3O-0007Ip-Md for importer@patchew.org; Wed, 27 Sep 2017 16:35:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57522) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dxJ0W-0005mU-CC for qemu-devel@nongnu.org; Wed, 27 Sep 2017 16:32:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dxJ0V-0007WT-Eu for qemu-devel@nongnu.org; Wed, 27 Sep 2017 16:32:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51478) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dxJ0V-0007Vz-9g for qemu-devel@nongnu.org; Wed, 27 Sep 2017 16:32:35 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 64F9DC09839C for ; Wed, 27 Sep 2017 20:32:34 +0000 (UTC) Received: from localhost (ovpn-116-18.gru2.redhat.com [10.97.116.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id F0A358AC21; Wed, 27 Sep 2017 20:32:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 64F9DC09839C Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=ehabkost@redhat.com From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Wed, 27 Sep 2017 17:32:25 -0300 Message-Id: <20170927203225.30896-3-ehabkost@redhat.com> In-Reply-To: <20170927203225.30896-1-ehabkost@redhat.com> References: <20170927203225.30896-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 27 Sep 2017 20:32:34 +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 2/2] qemu-options: Deprecate -nodefconfig 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_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Since 2012 (commit ba6212d8 "Eliminate cpus-x86_64.conf file") we have no default config files that would be disabled using -nodefconfig. Update documentation and document -nodefconfig as deprecated. Cc: Markus Armbruster Signed-off-by: Eduardo Habkost Acked-by: Alistair Francis --- qemu-options.hx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 39225ae6c3..bc52e79184 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4069,24 +4069,25 @@ output to stdout. This can be later used as input f= ile for @code{-readconfig} op ETEXI DEF("nodefconfig", 0, QEMU_OPTION_nodefconfig, "-nodefconfig\n" - " do not load default config files at startup\n", + " do not load default config files at startup (deprecat= ed)\n", QEMU_ARCH_ALL) STEXI @item -nodefconfig @findex -nodefconfig -Normally QEMU loads configuration files from @var{sysconfdir} and @var{dat= adir} at startup. -The @code{-nodefconfig} option will prevent QEMU from loading any of those= config files. +This option was used to disable loading of config files from @var{sysconfd= ir} +and @var{datadir}, but it is deprecated as QEMU doesn't load any config fi= les +from @var{datadir} anymore. To disable loading of config files from +@var{sysconfdir}, use @code{-no-user-config} instead. ETEXI DEF("no-user-config", 0, QEMU_OPTION_nouserconfig, "-no-user-config\n" - " do not load user-provided config files at startup\n", + " do not load default user-provided config files at sta= rtup\n", QEMU_ARCH_ALL) STEXI @item -no-user-config @findex -no-user-config The @code{-no-user-config} option makes QEMU not load any of the user-prov= ided -config files on @var{sysconfdir}, but won't make it skip the QEMU-provided= config -files from @var{datadir}. +config files on @var{sysconfdir}. ETEXI DEF("trace", HAS_ARG, QEMU_OPTION_trace, "-trace [[enable=3D]][,events=3D][,file=3D]\n" --=20 2.13.5