From nobody Fri May 3 16:20: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 1507065558111600.0727939084767; Tue, 3 Oct 2017 14:19:18 -0700 (PDT) Received: from localhost ([::1]:60313 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dzUat-0001SG-2s for importer@patchew.org; Tue, 03 Oct 2017 17:19:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36672) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dzUZN-0000W6-9N for qemu-devel@nongnu.org; Tue, 03 Oct 2017 17:17:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dzUZL-0007RW-SF for qemu-devel@nongnu.org; Tue, 03 Oct 2017 17:17:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50398) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dzUZL-0007Qk-MM for qemu-devel@nongnu.org; Tue, 03 Oct 2017 17:17:35 -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 B2CB9C04AC4E; Tue, 3 Oct 2017 21:17:34 +0000 (UTC) Received: from localhost (ovpn-116-35.gru2.redhat.com [10.97.116.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 456B117AA3; Tue, 3 Oct 2017 21:17:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B2CB9C04AC4E Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.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 18:17:29 -0300 Message-Id: <20171003211730.31843-2-ehabkost@redhat.com> In-Reply-To: <20171003211730.31843-1-ehabkost@redhat.com> References: <20171003211730.31843-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.31]); Tue, 03 Oct 2017 21:17: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 v2 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 , Alistair Francis 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 Acked-by: Alistair Francis Reviewed-by: Markus Armbruster Signed-off-by: Eduardo Habkost Reviewed-by: Daniel P. Berrange --- vl.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/vl.c b/vl.c index 3fed457921..ebea42e0ea 100644 --- a/vl.c +++ b/vl.c @@ -3111,7 +3111,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; @@ -3213,8 +3212,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; @@ -3222,7 +3219,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 Fri May 3 16:20:41 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1507065615012911.7098273621114; Tue, 3 Oct 2017 14:20:15 -0700 (PDT) Received: from localhost ([::1]:60316 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dzUbk-000298-3I for importer@patchew.org; Tue, 03 Oct 2017 17:20:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36690) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dzUZO-0000YT-Qh for qemu-devel@nongnu.org; Tue, 03 Oct 2017 17:17:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dzUZN-0007Vp-ON for qemu-devel@nongnu.org; Tue, 03 Oct 2017 17:17:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45966) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dzUZN-0007U3-EW for qemu-devel@nongnu.org; Tue, 03 Oct 2017 17:17:37 -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 883977E453; Tue, 3 Oct 2017 21:17:36 +0000 (UTC) Received: from localhost (ovpn-116-35.gru2.redhat.com [10.97.116.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1BC1262660; Tue, 3 Oct 2017 21:17:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 883977E453 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 18:17:30 -0300 Message-Id: <20171003211730.31843-3-ehabkost@redhat.com> In-Reply-To: <20171003211730.31843-1-ehabkost@redhat.com> References: <20171003211730.31843-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]); Tue, 03 Oct 2017 21:17:36 +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 v2 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 , Alistair Francis 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 Acked-by: Alistair Francis Signed-off-by: Eduardo Habkost Reviewed-by: Daniel P. Berrange --- Changes v1 -> v2: * Document at "Deprecated features" section in qemu-doc.texi (Daniel) * Remove documentation for the option from qemu-options.hx (Markus) --- qemu-doc.texi | 4 ++++ qemu-options.hx | 17 ++++------------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/qemu-doc.texi b/qemu-doc.texi index ecd186a159..039abe0cfe 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -2533,6 +2533,10 @@ or ``ivshmem-doorbell`` device types. The ``spapr-pci-vfio-host-bridge'' device type is replaced by the ``spapr-pci-host-bridge'' device type. =20 +@subsection -nodefconfig (since 2.11.0) + +The ``-nodefconfig`` argument is a synonym for ``-no-user-config``. + @node License @appendix License =20 diff --git a/qemu-options.hx b/qemu-options.hx index 39225ae6c3..981742d191 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4067,26 +4067,17 @@ Write device configuration to @var{file}. The @var{= file} can be either filename command line and device configuration into file or dash @code{-}) characte= r to print the output to stdout. This can be later used as input file for @code{-readconf= ig} option. ETEXI -DEF("nodefconfig", 0, QEMU_OPTION_nodefconfig, - "-nodefconfig\n" - " do not load default config files at startup\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. -ETEXI +HXCOMM Deprecated, same as -no-user-config +DEF("nodefconfig", 0, QEMU_OPTION_nodefconfig, "", QEMU_ARCH_ALL) 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