From ab8eb29c4a221fe365e3d1b4744c6992ba5f11bd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 20 Mar 2016 21:00:14 +0000 Subject: docs: Update documentation for stderr (now log) tracing backend. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes commit ed7f5f1d8db06fc31352a5ef4f54985e630c575a. Signed-off-by: Richard W.M. Jones. Reviewed-by: Alex Bennée Message-id: 1458507614-32470-1-git-send-email-rjones@redhat.com Cc: Paolo Bonzini Cc: Stefan Hajnoczi Signed-off-by: Stefan Hajnoczi --- docs/tracing.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/tracing.txt b/docs/tracing.txt index 3182ee82ad..0bd6b9cf9e 100644 --- a/docs/tracing.txt +++ b/docs/tracing.txt @@ -157,9 +157,9 @@ performance penalty. Note that regardless of the selected trace backend, events with the "disable" property will be generated with the "nop" backend. -=== Stderr === +=== Log === -The "stderr" backend sends trace events directly to standard error. This +The "log" backend sends trace events directly to standard error. This effectively turns trace events into debug printfs. This is the simplest backend and can be used together with existing code that -- cgit v1.2.3 From acc6809ddc45dd9a896c53ec7b61e66604923cd7 Mon Sep 17 00:00:00 2001 From: "Denis V. Lunev" Date: Wed, 16 Mar 2016 14:36:51 +0300 Subject: trace: do not always call exit() in trace_enable_events The problem is that virsh qemu-monitor-command --hmp VM log trace:help forces QEMU to exit even when running VM normally. Signed-off-by: Denis V. Lunev Reviewed-by: Paolo Bonzini Message-id: 1458128212-4197-2-git-send-email-den@openvz.org CC: Stefan Hajnoczi Reviewed-by: Paolo Bonzini Signed-off-by: Stefan Hajnoczi --- trace/control.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/trace/control.c b/trace/control.c index ccddda537f..d099f735d5 100644 --- a/trace/control.c +++ b/trace/control.c @@ -20,6 +20,7 @@ #include "qemu/log.h" #endif #include "qemu/error-report.h" +#include "monitor/monitor.h" int trace_events_enabled_count; bool trace_events_dstate[TRACE_EVENT_COUNT]; @@ -132,7 +133,9 @@ void trace_enable_events(const char *line_buf) { if (is_help_option(line_buf)) { trace_list_events(); - exit(0); + if (cur_mon == NULL) { + exit(0); + } } else { do_trace_enable_events(line_buf); } -- cgit v1.2.3 From 99affd1d5bd4e396ecda50e53dfbc5147fa1313d Mon Sep 17 00:00:00 2001 From: "Denis V. Lunev" Date: Wed, 16 Mar 2016 14:36:52 +0300 Subject: log: move qemu_log_close/qemu_log_flush from header to log.c There is no particular reason to keep these functions in the header. Suggested by Paolo. Signed-off-by: Denis V. Lunev Reviewed-by: Paolo Bonzini Message-id: 1458128212-4197-3-git-send-email-den@openvz.org CC: Stefan Hajnoczi CC: Paolo Bonzini Signed-off-by: Stefan Hajnoczi --- include/qemu/log.h | 22 +++++----------------- util/log.c | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/include/qemu/log.h b/include/qemu/log.h index cf38adbdb0..c52f136ac1 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -95,23 +95,6 @@ qemu_log_vprintf(const char *fmt, va_list va) /* Maintenance: */ -/* fflush() the log file */ -static inline void qemu_log_flush(void) -{ - fflush(qemu_logfile); -} - -/* Close the log file */ -static inline void qemu_log_close(void) -{ - if (qemu_logfile) { - if (qemu_logfile != stderr) { - fclose(qemu_logfile); - } - qemu_logfile = NULL; - } -} - /* define log items */ typedef struct QEMULogItem { int mask; @@ -146,4 +129,9 @@ int qemu_str_to_log_mask(const char *str); */ void qemu_print_log_usage(FILE *f); +/* fflush() the log file */ +void qemu_log_flush(void); +/* Close the log file */ +void qemu_log_close(void); + #endif diff --git a/util/log.c b/util/log.c index b219081e91..1857730dcb 100644 --- a/util/log.c +++ b/util/log.c @@ -198,6 +198,23 @@ void qemu_set_dfilter_ranges(const char *filter_spec) } } +/* fflush() the log file */ +void qemu_log_flush(void) +{ + fflush(qemu_logfile); +} + +/* Close the log file */ +void qemu_log_close(void) +{ + if (qemu_logfile) { + if (qemu_logfile != stderr) { + fclose(qemu_logfile); + } + qemu_logfile = NULL; + } +} + const QEMULogItem qemu_log_items[] = { { CPU_LOG_TB_OUT_ASM, "out_asm", "show generated host assembly code for each compiled TB" }, -- cgit v1.2.3 From a6d4953b6057dfc0b9b6b2d775231648fca3ca2b Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Wed, 23 Mar 2016 15:38:20 +0100 Subject: trace-events: Fix typos (found by codespell) Signed-off-by: Stefan Weil Reviewed-by: Luiz Capitulino Message-id: 1458743900-14742-1-git-send-email-sw@weilnetz.de Signed-off-by: Stefan Hajnoczi --- trace-events | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trace-events b/trace-events index d494de1446..996a77f013 100644 --- a/trace-events +++ b/trace-events @@ -144,8 +144,8 @@ cpu_out(unsigned int addr, char size, unsigned int val) "addr %#x(%c) value %u" # Since requests are raised via monitor, not many tracepoints are needed. balloon_event(void *opaque, unsigned long addr) "opaque %p addr %lu" virtio_balloon_handle_output(const char *name, uint64_t gpa) "section name: %s gpa: %"PRIx64 -virtio_balloon_get_config(uint32_t num_pages, uint32_t acutal) "num_pages: %d acutal: %d" -virtio_balloon_set_config(uint32_t acutal, uint32_t oldacutal) "acutal: %d oldacutal: %d" +virtio_balloon_get_config(uint32_t num_pages, uint32_t actual) "num_pages: %d actual: %d" +virtio_balloon_set_config(uint32_t actual, uint32_t oldactual) "actual: %d oldactual: %d" virtio_balloon_to_target(uint64_t target, uint32_t num_pages) "balloon target: %"PRIx64" num_pages: %d" # hw/intc/apic_common.c -- cgit v1.2.3