From patchwork Tue Apr 24 20:33:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 154762 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 37633B6FBB for ; Wed, 25 Apr 2012 06:57:27 +1000 (EST) Received: from localhost ([::1]:41905 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMmRP-0002Ln-TY for incoming@patchwork.ozlabs.org; Tue, 24 Apr 2012 16:34:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51910) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMmQ6-0007Bp-Lt for qemu-devel@nongnu.org; Tue, 24 Apr 2012 16:33:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SMmQ3-00006Z-6O for qemu-devel@nongnu.org; Tue, 24 Apr 2012 16:33:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32327) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMmQ2-00006L-VI for qemu-devel@nongnu.org; Tue, 24 Apr 2012 16:33:03 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q3OKX1lw008702 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 24 Apr 2012 16:33:01 -0400 Received: from blackpad.lan.raisama.net (ovpn-116-87.ams2.redhat.com [10.36.116.87]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q3OKWstK022200; Tue, 24 Apr 2012 16:32:55 -0400 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id 94B4F200E2D; Tue, 24 Apr 2012 17:33:02 -0300 (BRT) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 24 Apr 2012 17:33:00 -0300 Message-Id: <1335299581-25009-6-git-send-email-ehabkost@redhat.com> In-Reply-To: <1335299581-25009-1-git-send-email-ehabkost@redhat.com> References: <1335299581-25009-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: libvir-list@redhat.com, Jiri Denemark Subject: [Qemu-devel] [PATCH qemu 5/6] implement -no-user-config command-line option (v2) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Changes v1 -> v2: - Change 'userconfig' field/variables to bool instead of int - Coding style change Signed-off-by: Eduardo Habkost --- arch_init.c | 11 ++++++++--- qemu-config.h | 2 +- qemu-options.hx | 16 +++++++++++++--- vl.c | 6 +++++- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/arch_init.c b/arch_init.c index 62332e9..996baba 100644 --- a/arch_init.c +++ b/arch_init.c @@ -114,19 +114,24 @@ const uint32_t arch_type = QEMU_ARCH; static struct defconfig_file { const char *filename; + /* Indicates it is an user config file (disabled by -no-user-config) */ + bool userconfig; } default_config_files[] = { - { CONFIG_QEMU_CONFDIR "/qemu.conf" }, - { CONFIG_QEMU_CONFDIR "/target-" TARGET_ARCH ".conf" }, + { CONFIG_QEMU_CONFDIR "/qemu.conf", true }, + { CONFIG_QEMU_CONFDIR "/target-" TARGET_ARCH ".conf", true }, { NULL }, /* end of list */ }; -int qemu_read_default_config_files(void) +int qemu_read_default_config_files(bool userconfig) { int ret; struct defconfig_file *f; for (f = default_config_files; f->filename; f++) { + if (!userconfig && f->userconfig) { + continue; + } ret = qemu_read_config_file(f->filename); if (ret < 0 && ret != -ENOENT) { return ret; diff --git a/qemu-config.h b/qemu-config.h index ff934a1..6d7365d 100644 --- a/qemu-config.h +++ b/qemu-config.h @@ -18,6 +18,6 @@ int qemu_read_config_file(const char *filename); /* Read default Qemu config files */ -int qemu_read_default_config_files(void); +int qemu_read_default_config_files(bool userconfig); #endif /* QEMU_CONFIG_H */ diff --git a/qemu-options.hx b/qemu-options.hx index a169792..7d0b054 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2685,9 +2685,19 @@ DEF("nodefconfig", 0, QEMU_OPTION_nodefconfig, STEXI @item -nodefconfig @findex -nodefconfig -Normally QEMU loads a configuration file from @var{sysconfdir}/qemu.conf and -@var{sysconfdir}/target-@var{ARCH}.conf on startup. The @code{-nodefconfig} -option will prevent QEMU from loading these configuration files at startup. +Normally QEMU loads configuration files from @var{sysconfdir} and @var{datadir} at startup. +The @code{-nodefconfig} option will prevent QEMU from loading any of those config files. +ETEXI +DEF("no-user-config", 0, QEMU_OPTION_nouserconfig, + "-no-user-config\n" + " do not load user-provided config files at startup\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-provided +config files on @var{sysconfdir}, but won't make it skip the QEMU-provided config +files from @var{datadir}. ETEXI DEF("trace", HAS_ARG, QEMU_OPTION_trace, "-trace [events=][,file=]\n" diff --git a/vl.c b/vl.c index a4f4676..967b7e8 100644 --- a/vl.c +++ b/vl.c @@ -2280,6 +2280,7 @@ int main(int argc, char **argv, char **envp) int show_vnc_port = 0; #endif int defconfig = true; + bool userconfig = true; const char *log_mask = NULL; const char *log_file = NULL; GMemVTable mem_trace = { @@ -2348,13 +2349,16 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_nodefconfig: defconfig = false; break; + case QEMU_OPTION_nouserconfig: + userconfig = false; + break; } } } if (defconfig) { int ret; - ret = qemu_read_default_config_files(); + ret = qemu_read_default_config_files(userconfig); if (ret < 0) { exit(1); }