From nobody Mon May 6 04:35:47 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1532017680977204.95799270445048; Thu, 19 Jul 2018 09:28:00 -0700 (PDT) Received: from localhost ([::1]:44144 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgBma-0002f5-0O for importer@patchew.org; Thu, 19 Jul 2018 12:28:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45584) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgBju-00005g-VQ for qemu-devel@nongnu.org; Thu, 19 Jul 2018 12:25:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fgBjq-00041b-5z for qemu-devel@nongnu.org; Thu, 19 Jul 2018 12:25:14 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:50446 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fgBjp-00040p-If for qemu-devel@nongnu.org; Thu, 19 Jul 2018 12:25:10 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3DE574059FFD; Thu, 19 Jul 2018 16:25:09 +0000 (UTC) Received: from localhost (ovpn-117-80.ams2.redhat.com [10.36.117.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id B50661C5A6; Thu, 19 Jul 2018 16:25:05 +0000 (UTC) From: Stefan Hajnoczi To: Date: Thu, 19 Jul 2018 17:25:01 +0100 Message-Id: <20180719162501.32641-2-stefanha@redhat.com> In-Reply-To: <20180719162501.32641-1-stefanha@redhat.com> References: <20180719162501.32641-1-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 19 Jul 2018 16:25:09 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 19 Jul 2018 16:25:09 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'stefanha@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL for-3.0 1/1] tracing: Use double-dash spelling for trace option 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: Peter Maydell , Yaowei Bai , Stefan Hajnoczi 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" From: Yaowei Bai The '-trace' and '--trace' spellings are only both supported in qemu binary, while for qemu-nbd or qemu-img only '--trace' spelling is supported. So for the consistency of trace option invocation, we should use double-dash spelling in our documentation. This's also mentioned in https://wiki.qemu.org/BiteSizedTasks#Consistent_option_usage_in_documentati= on =2E Signed-off-by: Yaowei Bai Reviewed-by: Eric Blake Message-id: 1530674247-31200-1-git-send-email-baiyaowei@cmss.chinamobile.com Signed-off-by: Stefan Hajnoczi --- docs/devel/tracing.txt | 6 +++--- trace/control.h | 4 ++-- trace/control.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/devel/tracing.txt b/docs/devel/tracing.txt index 6f815ecbd7..bc52f12485 100644 --- a/docs/devel/tracing.txt +++ b/docs/devel/tracing.txt @@ -18,7 +18,7 @@ for debugging, profiling, and observing execution. =20 3. Run the virtual machine to produce a trace file: =20 - qemu -trace events=3D/tmp/events ... # your normal QEMU invocation + qemu --trace events=3D/tmp/events ... # your normal QEMU invocation =20 4. Pretty-print the binary trace file: =20 @@ -157,11 +157,11 @@ The state of events can also be queried and modified = through monitor commands: * trace-event NAME on|off Enable/disable a given trace event or a group of events (using wildcards= ). =20 -The "-trace events=3D" command line argument can be used to enable t= he +The "--trace events=3D" command line argument can be used to enable = the events listed in from the very beginning of the program. This file = must contain one event name per line. =20 -If a line in the "-trace events=3D" file begins with a '-', the trac= e event +If a line in the "--trace events=3D" file begins with a '-', the tra= ce event will be disabled instead of enabled. This is useful when a wildcard was u= sed to enable an entire family of events but one noisy event needs to be disab= led. =20 diff --git a/trace/control.h b/trace/control.h index eb65c8e320..0716f90f45 100644 --- a/trace/control.h +++ b/trace/control.h @@ -193,7 +193,7 @@ void trace_event_set_vcpu_state_dynamic(CPUState *vcpu, /** * trace_init_backends: * @file: Name of trace output file; may be NULL. - * Corresponds to commandline option "-trace file=3D...". + * Corresponds to commandline option "--trace file=3D...". * * Initialize the tracing backend. * @@ -204,7 +204,7 @@ bool trace_init_backends(void); /** * trace_init_file: * @file: Name of trace output file; may be NULL. - * Corresponds to commandline option "-trace file=3D...". + * Corresponds to commandline option "--trace file=3D...". * * Record the name of the output file for the tracing backend. * Exits if no selected backend does not support specifying the diff --git a/trace/control.c b/trace/control.c index e40cfca775..43fb7868db 100644 --- a/trace/control.c +++ b/trace/control.c @@ -253,7 +253,7 @@ void trace_init_file(const char *file) #ifdef CONFIG_TRACE_SIMPLE st_set_trace_file(file); #elif defined CONFIG_TRACE_LOG - /* If both the simple and the log backends are enabled, "-trace file" + /* If both the simple and the log backends are enabled, "--trace file" * only applies to the simple backend; use "-D" for the log backend. */ if (file) { @@ -261,7 +261,7 @@ void trace_init_file(const char *file) } #else if (file) { - fprintf(stderr, "error: -trace file=3D...: " + fprintf(stderr, "error: --trace file=3D...: " "option not supported by the selected tracing backends\n"); exit(1); } --=20 2.17.1