diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-09-19 13:27:11 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-09-19 13:27:11 +0100 |
| commit | 590c0ac982a8fc726f4784bb6e3c721661e0718a (patch) | |
| tree | 01d877fe78014bab13d0130ab18575e95f9d8644 /hw/core | |
| parent | 7cc0cdcd6a771010ca4a4857c4e4df966bb4e6c2 (diff) | |
| parent | 9f7ad79c16ede0da01902b18fb32929cfbd20f87 (diff) | |
| download | focaccia-qemu-590c0ac982a8fc726f4784bb6e3c721661e0718a.tar.gz focaccia-qemu-590c0ac982a8fc726f4784bb6e3c721661e0718a.zip | |
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: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/core')
| -rw-r--r-- | hw/core/loader.c | 3 | ||||
| -rw-r--r-- | hw/core/trace-events | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/hw/core/loader.c b/hw/core/loader.c index 75eb56ddbb..0d60219364 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -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); } } diff --git a/hw/core/trace-events b/hw/core/trace-events new file mode 100644 index 0000000000..fe47a9c8cb --- /dev/null +++ b/hw/core/trace-events @@ -0,0 +1,2 @@ +# loader.c +loader_write_rom(const char *name, uint64_t gpa, uint64_t size, bool isrom) "%s: @0x%"PRIx64" size=0x%"PRIx64" ROM=%d" |