From patchwork Wed Jun 9 08:05:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john cooper X-Patchwork-Id: 55058 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C57F9B7D12 for ; Wed, 9 Jun 2010 18:50:12 +1000 (EST) Received: from localhost ([127.0.0.1]:43958 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OMGzB-0004oa-W3 for incoming@patchwork.ozlabs.org; Wed, 09 Jun 2010 04:50:10 -0400 Received: from [140.186.70.92] (port=39983 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OMGeB-0006OB-SN for qemu-devel@nongnu.org; Wed, 09 Jun 2010 04:28:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OMGXF-0002Nj-Uv for qemu-devel@nongnu.org; Wed, 09 Jun 2010 04:21:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40072) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OMGXF-0002NL-O7 for qemu-devel@nongnu.org; Wed, 09 Jun 2010 04:21:17 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o598LFgS023533 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 9 Jun 2010 04:21:15 -0400 Received: from anvil.naka.net (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o598L95H018476; Wed, 9 Jun 2010 04:21:11 -0400 Message-ID: <4C0F4B66.3010106@redhat.com> Date: Wed, 09 Jun 2010 04:05:58 -0400 From: john cooper User-Agent: Thunderbird 2.0.0.9 (X11/20071115) MIME-Version: 1.0 To: qemu-devel@nongnu.org References: <4B672535.5050303@redhat.com> <4B6DBC01.4060307@redhat.com> In-Reply-To: <4B6DBC01.4060307@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: john.cooper@redhat.com Subject: [Qemu-devel] [PATCH] Add optional dump of default config file paths.. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch adds the ability to determine the build-configured runtime "config file" paths from the command line. After support for cpu model definitions were added to the default runtime "target-" config file, testing of this feature has tripped over an unintentionally mis-installed config file enough to indicate some help is needed resolving such issues. As no general "verbose" flag is currently available, specifying "-readconfig ?" on the command line will maintain the default (config file) disposition but additionally emit diagnostic info. This mode is optional, otherwise the existing startup behavior is identical. Signed-off-by: john cooper diff --git a/qemu-config.c b/qemu-config.c index 5a4e61b..a490603 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -518,21 +518,29 @@ out: return res; } -int qemu_read_config_file(const char *filename) +/* attempt to open and parse config file, report problems if vflag + */ +int qemu_read_config_file(const char *filename, int vflag) { FILE *f = fopen(filename, "r"); - int ret; + int rv = 0; if (f == NULL) { - return -errno; + rv = -errno; } - - ret = qemu_config_parse(f, vm_config_groups, filename); - fclose(f); - - if (ret == 0) { - return 0; - } else { - return -EINVAL; + else if (qemu_config_parse(f, vm_config_groups, filename) != 0) { + rv = -EINVAL; + } + else if (vflag) { + fprintf(stderr, "read config file %s\n", filename); } + if (f) { + fclose(f); + } + if (rv && vflag) { + fprintf(stderr, "can't read config file %s: %s\n", + filename, strerror(-rv)); + } + return rv; } + diff --git a/qemu-config.h b/qemu-config.h index dca69d4..2e15556 100644 --- a/qemu-config.h +++ b/qemu-config.h @@ -23,6 +23,6 @@ void qemu_add_globals(void); void qemu_config_write(FILE *fp); int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname); -int qemu_read_config_file(const char *filename); +int qemu_read_config_file(const char *filename, int vflag); #endif /* QEMU_CONFIG_H */ diff --git a/vl.c b/vl.c index 7121cd0..23c7276 100644 --- a/vl.c +++ b/vl.c @@ -2582,6 +2582,7 @@ int main(int argc, char **argv, char **envp) #endif int show_vnc_port = 0; int defconfig = 1; + int defconfig_verbose = 0; error_set_progname(argv[0]); @@ -2657,6 +2658,10 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_nodefconfig: defconfig=0; break; + case QEMU_OPTION_readconfig: + if (!strcmp(optarg, "?")) + defconfig_verbose = 1; + break; } } } @@ -2664,12 +2669,14 @@ int main(int argc, char **argv, char **envp) if (defconfig) { int ret; - ret = qemu_read_config_file(CONFIG_QEMU_CONFDIR "/qemu.conf"); + ret = qemu_read_config_file(CONFIG_QEMU_CONFDIR "/qemu.conf", + defconfig_verbose); if (ret < 0 && ret != -ENOENT) { exit(1); } - ret = qemu_read_config_file(arch_config_name); + ret = qemu_read_config_file(arch_config_name, + defconfig_verbose); if (ret < 0 && ret != -ENOENT) { exit(1); } @@ -3386,15 +3393,9 @@ int main(int argc, char **argv, char **envp) xen_mode = XEN_ATTACH; break; case QEMU_OPTION_readconfig: - { - int ret = qemu_read_config_file(optarg); - if (ret < 0) { - fprintf(stderr, "read config %s: %s\n", optarg, - strerror(-ret)); - exit(1); - } - break; - } + if (!defconfig_verbose && qemu_read_config_file(optarg, 1) < 0) + exit(1); + break; case QEMU_OPTION_writeconfig: { FILE *fp;