mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-----BEGIN PGP SIGNATURE-----

Browse Source 
Version: GnuPG v1
 
 iQEcBAABAgAGBQJW/RmLAAoJEJykq7OBq3PIsM0H/iAV207YgOqQl9PdQm1tM9/D
 h6jcOmNgINqq5Swu612gdUtg/95wVW8aOgacVuLumau5a+jy+mHf4xQFDOVRsmEc
 2TnVzP5/ZFJz168JL0hoXRP2PNI5RQgL4xCXEZca+7M2/A2pbslL+X2Fhf5W61wD
 RLmNHUS+9AlWCRm+LGM/4OC2H14UAEk4450fzIJ914lMv+/VD7IvUD2AEKCgwGYu
 dGSTiUD02/8zycFOBIGYg4Jc0F1prUXDjJyuPym/JYKRd1Nu788D0zaCwcaPCvqC
 86a0q1bwRVqUKWv+NWbQLEczaVbqTLpQQYdp0xRFDZxeQJcTkNwpRVCouHYphdg=
 =Y36K
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging

# gpg: Signature made Thu 31 Mar 2016 13:35:23 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/tracing-pull-request:
  trace-events: Fix typos (found by codespell)
  log: move qemu_log_close/qemu_log_flush from header to log.c
  trace: do not always call exit() in trace_enable_events
  docs: Update documentation for stderr (now log) tracing backend.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2016-03-31 13:49:59 +01:00
commit 1458317c8a
5 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/tracing.txt
View File

@ -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

22
include/qemu/log.h
View File

@ -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

4
trace-events
View File

@ -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

5
trace/control.c
View File

@ -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);
}

17
util/log.c
View File

@ -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" },