Commit 590c0ac9 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Pull request

# gpg: Signature made Wed 18 Sep 2019 14:17:59 BST
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/tracing-pull-request:
  trace: Forbid event format ending with newline character
  trace: Remove trailing newline in events
  loader: Trace loaded images

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7cc0cdcd 9f7ad79c

Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ trace-events-subdirs += target/riscv 
trace-events-subdirs += target/s390x

trace-events-subdirs += target/sparc

trace-events-subdirs += util

trace-events-subdirs += hw/core



trace-events-files = $(SRC_PATH)/trace-events $(trace-events-subdirs:%=$(SRC_PATH)/%/trace-events)

docs/devel/tracing.txt

+2 −0
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ Trace events should use types as follows: 
Format strings should reflect the types defined in the trace event.  Take

special care to use PRId64 and PRIu64 for int64_t and uint64_t types,

respectively.  This ensures portability between 32- and 64-bit platforms.

Format strings must not end with a newline character.  It is the responsibility

of backends to adapt line ending for proper logging.



Each event declaration will start with the event name, then its arguments,

finally a format string for pretty-printing. For example:

hw/core/loader.c

+3 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include "qemu/osdep.h"

#include "qemu-common.h"

#include "qapi/error.h"

#include "trace.h"

#include "hw/hw.h"

#include "disas/disas.h"

#include "migration/vmstate.h"
@@ -1151,6 +1152,8 @@ static void rom_reset(void *unused) 
         * CPU definitely fetches its instructions from the just written data.

         */

        cpu_flush_icache_range(rom->addr, rom->datasize);



        trace_loader_write_rom(rom->name, rom->addr, rom->datasize, rom->isrom);

    }

}

hw/core/trace-events

0 → 100644
+2 −0
Original line number Diff line number Diff line 
# loader.c

loader_write_rom(const char *name, uint64_t gpa, uint64_t size, bool isrom) "%s: @0x%"PRIx64" size=0x%"PRIx64" ROM=%d"

hw/misc/trace-events

+5 −5
Original line number Diff line number Diff line
@@ -118,11 +118,11 @@ iotkit_secctl_ns_read(uint32_t offset, uint64_t data, unsigned size) "IoTKit Sec 
iotkit_secctl_ns_write(uint32_t offset, uint64_t data, unsigned size) "IoTKit SecCtl NS regs write: offset 0x%x data 0x%" PRIx64 " size %u"



# imx6ul_ccm.c

ccm_entry(void) "\n"

ccm_freq(uint32_t freq) "freq = %d\n"

ccm_clock_freq(uint32_t clock, uint32_t freq) "(Clock = %d) = %d\n"

ccm_read_reg(const char *reg_name, uint32_t value) "reg[%s] <= 0x%" PRIx32 "\n"

ccm_write_reg(const char *reg_name, uint32_t value) "reg[%s] => 0x%" PRIx32 "\n"

ccm_entry(void) ""

ccm_freq(uint32_t freq) "freq = %d"

ccm_clock_freq(uint32_t clock, uint32_t freq) "(Clock = %d) = %d"

ccm_read_reg(const char *reg_name, uint32_t value) "reg[%s] <= 0x%" PRIx32

ccm_write_reg(const char *reg_name, uint32_t value) "reg[%s] => 0x%" PRIx32



# iotkit-sysinfo.c

iotkit_sysinfo_read(uint64_t offset, uint64_t data, unsigned size) "IoTKit SysInfo read: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u"