[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/17] log: fix parsing of multiple trace:PATTERN log
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 13/17] log: fix parsing of multiple trace:PATTERN log args |
Date: |
Thu, 15 Sep 2016 16:21:52 +0200 |
From: "Daniel P. Berrange" <address@hidden>
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 <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
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)
--
1.8.3.1
- [Qemu-devel] [PULL 02/17] virtio-scsi: Don't abort when media is ejected, (continued)
- [Qemu-devel] [PULL 02/17] virtio-scsi: Don't abort when media is ejected, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 04/17] cutils: Rewrite x86 buffer zero checking, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 05/17] Change net/socket.c to use socket_*() functions, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 06/17] memory: remove memory_region_destructor_rom_device, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 07/17] scsi: pvscsi: limit process IO loop to ring size, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 08/17] pc: apic: fix touch LAPIC when irqchip is split, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 09/17] target-i386: fix ordering of fields in CPUX86State, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 10/17] linux-user: complete omission of removing uses of strdup, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 11/17] build-sys: add make 'help' target, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 12/17] qemu-char: avoid segfault if user lacks of permisson of a given logfile, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 13/17] log: fix parsing of multiple trace:PATTERN log args,
Paolo Bonzini <=
- [Qemu-devel] [PULL 14/17] target-i386: Fixed syscall posssible segfault, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 15/17] pc: apic: introduce APIC macro, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 16/17] kvmvapic: fix state change handler, Paolo Bonzini, 2016/09/15
- [Qemu-devel] [PULL 17/17] pcspk: adding vmstate for save/restore, Paolo Bonzini, 2016/09/15
- Re: [Qemu-devel] [PULL 00/17] Second batch of misc patches for QEMU 2.8, no-reply, 2016/09/15
- Re: [Qemu-devel] [PULL 00/17] Second batch of misc patches for QEMU 2.8, Peter Maydell, 2016/09/15