summary refs log tree commit diff stats
path: root/include/qemu/log.h
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2016-06-15 19:27:15 +0200
committerMarkus Armbruster <armbru@redhat.com>2016-06-20 16:38:31 +0200
commitbd6fee9f1263dc5ba487c7ac57d33a727af63c00 (patch)
treed4bfe62cf9142dd4868e66fd04399198da54966a /include/qemu/log.h
parent2ec62faea274aabb2feaad2b8f85961161b5e1e4 (diff)
downloadfocaccia-qemu-bd6fee9f1263dc5ba487c7ac57d33a727af63c00.tar.gz
focaccia-qemu-bd6fee9f1263dc5ba487c7ac57d33a727af63c00.zip
log: Fix qemu_set_dfilter_ranges() error reporting
g_error() is not an acceptable way to report errors to the user:

    $ qemu-system-x86_64 -dfilter 1000+0

    ** (process:17187): ERROR **: Failed to parse range in: 1000+0
    Trace/breakpoint trap (core dumped)

g_assert() isn't, either:

    $ qemu-system-x86_64 -dfilter 1000x+64
    **
    ERROR:/work/armbru/qemu/util/log.c:180:qemu_set_dfilter_ranges: assertion failed: (e == range_op)
    Aborted (core dumped)

Convert qemu_set_dfilter_ranges() to Error.  Rework its deeply nested
control flow.  Touch up the error messages.  Call it with
&error_fatal.

This also permits testing without a subprocess, so do that.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1466011636-6112-3-git-send-email-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'include/qemu/log.h')
-rw-r--r--include/qemu/log.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/qemu/log.h b/include/qemu/log.h
index 234fa81153..df8d041854 100644
--- a/include/qemu/log.h
+++ b/include/qemu/log.h
@@ -107,7 +107,7 @@ extern const QEMULogItem qemu_log_items[];
 void qemu_set_log(int log_flags);
 void qemu_log_needs_buffers(void);
 void qemu_set_log_filename(const char *filename);
-void qemu_set_dfilter_ranges(const char *ranges);
+void qemu_set_dfilter_ranges(const char *ranges, Error **errp);
 bool qemu_log_in_addr_range(uint64_t addr);
 int qemu_str_to_log_mask(const char *str);