From patchwork Tue May 3 20:40:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?Q?Llu=C3=ADs?= X-Patchwork-Id: 93893 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B1613B6F6C for ; Wed, 4 May 2011 06:40:59 +1000 (EST) Received: from localhost ([::1]:54306 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QHMOu-0003AG-Tr for incoming@patchwork.ozlabs.org; Tue, 03 May 2011 16:40:56 -0400 Received: from eggs.gnu.org ([140.186.70.92]:39742) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QHMOT-00035M-6p for qemu-devel@nongnu.org; Tue, 03 May 2011 16:40:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QHMOS-00011h-9b for qemu-devel@nongnu.org; Tue, 03 May 2011 16:40:29 -0400 Received: from mailout-de.gmx.net ([213.165.64.22]:60690) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QHMOR-00011T-TJ for qemu-devel@nongnu.org; Tue, 03 May 2011 16:40:28 -0400 Received: (qmail invoked by alias); 03 May 2011 20:40:26 -0000 Received: from unknown (EHLO localhost) [84.88.53.92] by mail.gmx.net (mp050) with SMTP; 03 May 2011 22:40:26 +0200 X-Authenticated: #12333383 X-Provags-ID: V01U2FsdGVkX1/qtKwY4XDq0Oe9ukAd6EBPzDuvYlAQ9UwNgFxECC MY4fF3WBwLxQJx To: qemu-devel@nongnu.org From: =?utf-8?b?TGx1w61z?= Date: Tue, 03 May 2011 22:40:56 +0200 Message-ID: <20110503204056.438.46770.stgit@ginnungagap.bsc.es> In-Reply-To: <20110503204042.438.2257.stgit@ginnungagap.bsc.es> References: <20110503204042.438.2257.stgit@ginnungagap.bsc.es> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Y-GMX-Trusted: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 213.165.64.22 Cc: stefanha@gmail.com, chouteau@adacore.com Subject: [Qemu-devel] [PATCH v4 02/10] trace: avoid conditional code compilation during option parsing 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 Instead of conditionally compiling option support, perform checks and issue the corresponding error messages. Signed-off-by: Lluís Vilanova --- configure | 4 +++- qemu-config.c | 4 ---- qemu-options.hx | 6 ++++-- vl.c | 17 +++++++++++++---- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 6f75e2e..fef7d35 100755 --- a/configure +++ b/configure @@ -2945,7 +2945,9 @@ bsd) esac echo "TRACE_BACKEND=$trace_backend" >> $config_host_mak -if test "$trace_backend" = "simple"; then +if test "$trace_backend" = "nop"; then + echo "CONFIG_TRACE_NOP=y" >> $config_host_mak +elif test "$trace_backend" = "simple"; then echo "CONFIG_SIMPLE_TRACE=y" >> $config_host_mak fi # Set the appropriate trace file. diff --git a/qemu-config.c b/qemu-config.c index 14d3419..db5b14c 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -296,7 +296,6 @@ static QemuOptsList qemu_mon_opts = { }, }; -#ifdef CONFIG_SIMPLE_TRACE static QemuOptsList qemu_trace_opts = { .name = "trace", .implied_opt_name = "trace", @@ -309,7 +308,6 @@ static QemuOptsList qemu_trace_opts = { { /* end if list */ } }, }; -#endif static QemuOptsList qemu_cpudef_opts = { .name = "cpudef", @@ -460,9 +458,7 @@ static QemuOptsList *vm_config_groups[32] = { &qemu_global_opts, &qemu_mon_opts, &qemu_cpudef_opts, -#ifdef CONFIG_SIMPLE_TRACE &qemu_trace_opts, -#endif &qemu_option_rom_opts, NULL, }; diff --git a/qemu-options.hx b/qemu-options.hx index 489df10..b439120 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2356,17 +2356,19 @@ 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. ETEXI -#ifdef CONFIG_SIMPLE_TRACE DEF("trace", HAS_ARG, QEMU_OPTION_trace, "-trace\n" " Specify a trace file to log traces to\n", QEMU_ARCH_ALL) STEXI +HXCOMM This line is not accurate, as the option is backend-specific but HX does +HXCOMM not support conditional compilation of text. @item -trace @findex -trace Specify a trace file to log output traces to. + +This option is available only when using the @var{simple} tracing backend. ETEXI -#endif HXCOMM This is the last statement. Insert new options before this line! STEXI diff --git a/vl.c b/vl.c index 3eac0bc..9db7b64 100644 --- a/vl.c +++ b/vl.c @@ -2744,14 +2744,23 @@ int main(int argc, char **argv, char **envp) } xen_mode = XEN_ATTACH; break; -#ifdef CONFIG_SIMPLE_TRACE case QEMU_OPTION_trace: opts = qemu_opts_parse(qemu_find_opts("trace"), optarg, 0); - if (opts) { - trace_file = qemu_opt_get(opts, "file"); + if (!opts) { + exit(1); } - break; +#if defined(CONFIG_TRACE_NOP) + fprintf(stderr, "qemu: option \"-%s\" is not supported by this tracing backend\n", popt->name); + exit(1); #endif + trace_file = qemu_opt_get(opts, "file"); +#if !defined(CONFIG_SIMPLE_TRACE) + if (trace_file) { + fprintf(stderr, "qemu: suboption \"-%s file\" is not supported by this tracing backend\n", popt->name); + exit(1); + } +#endif + break; case QEMU_OPTION_readconfig: { int ret = qemu_read_config_file(optarg);