Commit cc9a366d authored by Peter Maydell's avatar Peter Maydell
Browse files

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



# gpg: Signature made Wed 28 Sep 2016 22:30:45 BST
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/tracing-pull-request:
  trace: Document the execution mode of guest events
  trace: Add event "guest_cpu_reset"
  trace: Add event "guest_cpu_enter"
  trace: Properly initialize dynamic event states in hot-plugged vCPUs
  trace: move hw/virtio/virtio-balloon.c trace points into correct file
  trace: move hw/mem/pc-dimm.c trace points into correct file
  trace: move util/qemu-coroutine*.c trace points into correct file
  trace: move util/buffer.c trace points into correct file

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c640f284 43e21e49

Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ trace-events-y += hw/dma/trace-events 
trace-events-y += hw/sparc/trace-events

trace-events-y += hw/sd/trace-events

trace-events-y += hw/isa/trace-events

trace-events-y += hw/mem/trace-events

trace-events-y += hw/i386/trace-events

trace-events-y += hw/9pfs/trace-events

trace-events-y += hw/ppc/trace-events

bsd-user/main.c

+0 −1
Original line number Diff line number Diff line
@@ -1116,7 +1116,6 @@ int main(int argc, char **argv) 
        gdbserver_start (gdbstub_port);

        gdb_handlesig(cpu, 0);

    }

    trace_init_vcpu_events();

    cpu_loop(env);

    /* never exits */

    return 0;

hw/i386/trace-events

+0 −4
Original line number Diff line number Diff line
@@ -7,10 +7,6 @@ xen_platform_log(char *s) "xen platform: %s" 
xen_pv_mmio_read(uint64_t addr) "WARNING: read from Xen PV Device MMIO space (address %"PRIx64")"

xen_pv_mmio_write(uint64_t addr) "WARNING: write to Xen PV Device MMIO space (address %"PRIx64")"



# hw/i386/pc.c

mhp_pc_dimm_assigned_slot(int slot) "%d"

mhp_pc_dimm_assigned_address(uint64_t addr) "0x%"PRIx64



# hw/i386/x86-iommu.c

x86_iommu_iec_notify(bool global, uint32_t index, uint32_t mask) "Notify IEC invalidation: global=%d index=%" PRIu32 " mask=%" PRIu32

hw/mem/trace-events

0 → 100644
+5 −0
Original line number Diff line number Diff line 
# See docs/trace-events.txt for syntax documentation.



# hw/mem/pc-dimm.c

mhp_pc_dimm_assigned_slot(int slot) "%d"

mhp_pc_dimm_assigned_address(uint64_t addr) "0x%"PRIx64

hw/virtio/trace-events

+5 −0
Original line number Diff line number Diff line
@@ -14,3 +14,8 @@ virtio_rng_guest_not_ready(void *rng) "rng %p: guest not ready" 
virtio_rng_pushed(void *rng, size_t len) "rng %p: %zd bytes pushed"

virtio_rng_request(void *rng, size_t size, unsigned quota) "rng %p: %zd bytes requested, %u bytes quota left"



# hw/virtio/virtio-balloon.c

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