From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkDUa-000208-BJ for qemu-devel@nongnu.org; Wed, 14 Sep 2016 12:57:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bkDUY-0003ic-A3 for qemu-devel@nongnu.org; Wed, 14 Sep 2016 12:56:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30790) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkDUY-0003iW-2D for qemu-devel@nongnu.org; Wed, 14 Sep 2016 12:56:58 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 82A0E9B0E9 for ; Wed, 14 Sep 2016 16:56:57 +0000 (UTC) References: <1473186343-16704-1-git-send-email-berrange@redhat.com> From: Paolo Bonzini Message-ID: Date: Wed, 14 Sep 2016 18:56:54 +0200 MIME-Version: 1.0 In-Reply-To: <1473186343-16704-1-git-send-email-berrange@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v1] log: fix parsing of multiple trace:PATTERN log args List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Daniel P. Berrange" , qemu-devel@nongnu.org On 06/09/2016 20:25, Daniel P. Berrange wrote: > If giving QEMU a log arg which asks to enable multiple > different trace event patterns such as > > $QEMU -d trace:qio*,trace:qcrypto* > > the parser will then invoke > > trace_enable_events("qio*,trace:qcrypto*") > trace_enable_events("qcrypto*") > > as when finding a 'trace:' prefix, it is not clever > enough to strip anything after the next comma. As > a result only the last 'trace:' match ever works. > > Rather than trying to be more clever with parsing the > command line arg in place, simplify the code by > using g_strsplit to break it into individual strings > on ','. These resulting pieces can be directly used > without worrying about trailing data from the next > option. > > Signed-off-by: Daniel P. Berrange > --- > util/log.c | 41 +++++++++++++++-------------------------- > 1 file changed, 15 insertions(+), 26 deletions(-) > > diff --git a/util/log.c b/util/log.c > index 54b54e8..e077340 100644 > --- a/util/log.c > +++ b/util/log.c > @@ -275,53 +275,42 @@ const QEMULogItem qemu_log_items[] = { > { 0, NULL, NULL }, > }; > > -static int cmp1(const char *s1, int n, const char *s2) > -{ > - if (strlen(s2) != n) { > - return 0; > - } > - return memcmp(s1, s2, n) == 0; > -} > - > /* takes a comma separated list of log masks. Return 0 if error. */ > int qemu_str_to_log_mask(const char *str) > { > const QEMULogItem *item; > - int mask; > - const char *p, *p1; > + int mask = 0; > + char **parts = g_strsplit(str, ",", 0); > + char **tmp; > > - p = str; > - mask = 0; > - for (;;) { > - p1 = strchr(p, ','); > - if (!p1) { > - p1 = p + strlen(p); > - } > - if (cmp1(p,p1-p,"all")) { > + for (tmp = parts; tmp && *tmp; tmp++) { > + if (g_str_equal(*tmp, "all")) { > for (item = qemu_log_items; item->mask != 0; item++) { > mask |= item->mask; > } > #ifdef CONFIG_TRACE_LOG > - } else if (strncmp(p, "trace:", 6) == 0 && p + 6 != p1) { > - trace_enable_events(p + 6); > + } else if (g_str_has_prefix(*tmp, "trace:") && (*tmp)[6] != '\0') { > + trace_enable_events((*tmp) + 6); > mask |= LOG_TRACE; > #endif > } else { > for (item = qemu_log_items; item->mask != 0; item++) { > - if (cmp1(p, p1 - p, item->name)) { > + if (g_str_equal(*tmp, item->name)) { > goto found; > } > } > - return 0; > + goto error; > found: > mask |= item->mask; > } > - if (*p1 != ',') { > - break; > - } > - p = p1 + 1; > } > + > + g_strfreev(parts); > return mask; > + > + error: > + g_strfreev(parts); > + return 0; > } > > void qemu_print_log_usage(FILE *f) > Queued, thanks. Paolo