OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

log: fix parsing of multiple trace:PATTERN log args 

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 <berrange@redhat.com>
Message-Id: <1473186343-16704-1-git-send-email-berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Daniel P. Berrange 2016-09-06 19:25:43 +01:00 committed by Paolo Bonzini
parent 71200fb966
commit 89d0a64f49
1 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
util/log.c
View File

@ -275,53 +275,42 @@ const QEMULogItem qemu_log_items[] = {
{ 0, NULL, NULL }, { 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. */ /* takes a comma separated list of log masks. Return 0 if error. */
int qemu_str_to_log_mask(const char *str) int qemu_str_to_log_mask(const char *str)
{ {
const QEMULogItem *item; const QEMULogItem *item;
int mask; int mask = 0;
const char *p, *p1; char **parts = g_strsplit(str, ",", 0);
char **tmp;
p = str; for (tmp = parts; tmp && *tmp; tmp++) {
mask = 0; if (g_str_equal(*tmp, "all")) {
for (;;) {
p1 = strchr(p, ',');
if (!p1) {
p1 = p + strlen(p);
}
if (cmp1(p,p1-p,"all")) {
for (item = qemu_log_items; item->mask != 0; item++) { for (item = qemu_log_items; item->mask != 0; item++) {
mask |= item->mask; mask |= item->mask;
} }
#ifdef CONFIG_TRACE_LOG #ifdef CONFIG_TRACE_LOG
} else if (strncmp(p, "trace:", 6) == 0 && p + 6 != p1) { } else if (g_str_has_prefix(*tmp, "trace:") && (*tmp)[6] != '\0') {
trace_enable_events(p + 6); trace_enable_events((*tmp) + 6);
mask |= LOG_TRACE; mask |= LOG_TRACE;
#endif #endif
} else { } else {
for (item = qemu_log_items; item->mask != 0; item++) { 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; goto found;
} }
} }
return 0; goto error;
found: found:
mask |= item->mask; mask |= item->mask;
} }
if (*p1 != ',') {
break;
}
p = p1 + 1;
} }
g_strfreev(parts);
return mask; return mask;
error:
g_strfreev(parts);
return 0;
} }
void qemu_print_log_usage(FILE *f) void qemu_print_log_usage(FILE *f)