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

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



Pull request

Compilation fixes and cleanups for QEMU 4.0.0.

# gpg: Signature made Mon 25 Mar 2019 15:58:28 GMT
# gpg:                using RSA key 9CA4ABB381AB73C8
# 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-events: Fix attribution of trace points to source
  trace-events: Delete unused trace points
  scripts/cleanup-trace-events: Update for current practice
  trace-events: Shorten file names in comments
  trace-events: Consistently point to docs/devel/tracing.txt
  trace: avoid SystemTap dtrace(1) warnings on empty files
  trace: handle tracefs path truncation

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 50ccc488 dec97760

accel/kvm/trace-events

+1 −1
Original line number Diff line number Diff line 
# Trace events for debugging and performance instrumentation

# See docs/devel/tracing.txt for syntax documentation.



# kvm-all.c

kvm_ioctl(int type, void *arg) "type 0x%x, arg %p"

accel/tcg/trace-events

+1 −1
Original line number Diff line number Diff line 
# Trace events for debugging and performance instrumentation

# See docs/devel/tracing.txt for syntax documentation.



# TCG related tracing (mostly disabled by default)

# cpu-exec.c

audio/trace-events

+3 −3
Original line number Diff line number Diff line 
# See docs/devel/tracing.txt for syntax documentation.



# audio/alsaaudio.c

# alsaaudio.c

alsa_revents(int revents) "revents = %d"

alsa_pollout(int i, int fd) "i = %d fd = %d"

alsa_set_handler(int events, int index, int fd, int err) "events=0x%x index=%d fd=%d err=%d"
@@ -12,11 +12,11 @@ alsa_resume_out(void) "Resuming suspended output stream" 
alsa_resume_in(void) "Resuming suspended input stream"

alsa_no_frames(int state) "No frames available and ALSA state is %d"



# audio/ossaudio.c

# ossaudio.c

oss_version(int version) "OSS version = 0x%x"

oss_invalid_available_size(int size, int bufsize) "Invalid available size, size=%d bufsize=%d"



# audio/audio.c

# audio.c

audio_timer_start(int interval) "interval %d ms"

audio_timer_stop(void) ""

audio_timer_delayed(int interval) "interval %d ms"

authz/trace-events

+5 −5
Original line number Diff line number Diff line 
# See docs/devel/tracing.txt for syntax documentation.



# authz/base.c

# base.c

qauthz_is_allowed(void *authz, const char *identity, bool allowed) "AuthZ %p check identity=%s allowed=%d"



# auth/simple.c

# simple.c

qauthz_simple_is_allowed(void *authz, const char *wantidentity, const char *gotidentity) "AuthZ simple %p check want identity=%s got identity=%s"



# auth/list.c

# list.c

qauthz_list_check_rule(void *authz, const char *identity, const char *rule, int format, int policy) "AuthZ list %p check rule=%s identity=%s format=%d policy=%d"

qauthz_list_default_policy(void *authz, const char *identity, int policy) "AuthZ list %p default identity=%s policy=%d"



# auth/listfile.c

# listfile.c

qauthz_list_file_load(void *authz, const char *filename) "AuthZ file %p load filename=%s"

qauthz_list_file_refresh(void *authz, const char *filename, int success) "AuthZ file %p load filename=%s success=%d"



# auth/pam.c

# pamacct.c

qauthz_pam_check(void *authz, const char *identity, const char *service) "AuthZ PAM %p identity=%s service=%s"

block/trace-events

+24 −25
Original line number Diff line number Diff line 
# See docs/devel/tracing.txt for syntax documentation.



# block.c

# ../block.c

bdrv_open_common(void *bs, const char *filename, int flags, const char *format_name) "bs %p filename \"%s\" flags 0x%x format_name \"%s\""

bdrv_lock_medium(void *bs, bool locked) "bs %p locked %d"



# block/block-backend.c

# block-backend.c

blk_co_preadv(void *blk, void *bs, int64_t offset, unsigned int bytes, int flags) "blk %p bs %p offset %"PRId64" bytes %u flags 0x%x"

blk_co_pwritev(void *blk, void *bs, int64_t offset, unsigned int bytes, int flags) "blk %p bs %p offset %"PRId64" bytes %u flags 0x%x"

blk_root_attach(void *child, void *blk, void *bs) "child %p blk %p bs %p"

blk_root_detach(void *child, void *blk, void *bs) "child %p blk %p bs %p"



# block/io.c

# io.c

bdrv_co_preadv(void *bs, int64_t offset, int64_t nbytes, unsigned int flags) "bs %p offset %"PRId64" nbytes %"PRId64" flags 0x%x"

bdrv_co_pwritev(void *bs, int64_t offset, int64_t nbytes, unsigned int flags) "bs %p offset %"PRId64" nbytes %"PRId64" flags 0x%x"

bdrv_co_pwrite_zeroes(void *bs, int64_t offset, int count, int flags) "bs %p offset %"PRId64" count %d flags 0x%x"
@@ -18,15 +18,15 @@ bdrv_co_do_copy_on_readv(void *bs, int64_t offset, unsigned int bytes, int64_t c 
bdrv_co_copy_range_from(void *src, uint64_t src_offset, void *dst, uint64_t dst_offset, uint64_t bytes, int read_flags, int write_flags) "src %p offset %"PRIu64" dst %p offset %"PRIu64" bytes %"PRIu64" rw flags 0x%x 0x%x"

bdrv_co_copy_range_to(void *src, uint64_t src_offset, void *dst, uint64_t dst_offset, uint64_t bytes, int read_flags, int write_flags) "src %p offset %"PRIu64" dst %p offset %"PRIu64" bytes %"PRIu64" rw flags 0x%x 0x%x"



# block/stream.c

# stream.c

stream_one_iteration(void *s, int64_t offset, uint64_t bytes, int is_allocated) "s %p offset %" PRId64 " bytes %" PRIu64 " is_allocated %d"

stream_start(void *bs, void *base, void *s) "bs %p base %p s %p"



# block/commit.c

# commit.c

commit_one_iteration(void *s, int64_t offset, uint64_t bytes, int is_allocated) "s %p offset %" PRId64 " bytes %" PRIu64 " is_allocated %d"

commit_start(void *bs, void *base, void *top, void *s) "bs %p base %p top %p s %p"



# block/mirror.c

# mirror.c

mirror_start(void *bs, void *s, void *opaque) "bs %p s %p opaque %p"

mirror_restart_iter(void *s, int64_t cnt) "s %p dirty count %"PRId64

mirror_before_flush(void *s) "s %p"
@@ -37,7 +37,7 @@ mirror_iteration_done(void *s, int64_t offset, uint64_t bytes, int ret) "s %p of 
mirror_yield(void *s, int64_t cnt, int buf_free_count, int in_flight) "s %p dirty count %"PRId64" free buffers %d in_flight %d"

mirror_yield_in_flight(void *s, int64_t offset, int in_flight) "s %p offset %" PRId64 " in_flight %d"



# block/backup.c

# backup.c

backup_do_cow_enter(void *job, int64_t start, int64_t offset, uint64_t bytes) "job %p start %" PRId64 " offset %" PRId64 " bytes %" PRIu64

backup_do_cow_return(void *job, int64_t offset, uint64_t bytes, int ret) "job %p offset %" PRId64 " bytes %" PRIu64 " ret %d"

backup_do_cow_skip(void *job, int64_t start) "job %p start %"PRId64
@@ -46,7 +46,7 @@ backup_do_cow_read_fail(void *job, int64_t start, int ret) "job %p start %"PRId6 
backup_do_cow_write_fail(void *job, int64_t start, int ret) "job %p start %"PRId64" ret %d"

backup_do_cow_copy_range_fail(void *job, int64_t start, int ret) "job %p start %"PRId64" ret %d"



# blockdev.c

# ../blockdev.c

qmp_block_job_cancel(void *job) "job %p"

qmp_block_job_pause(void *job) "job %p"

qmp_block_job_resume(void *job) "job %p"
@@ -55,13 +55,12 @@ qmp_block_job_finalize(void *job) "job %p" 
qmp_block_job_dismiss(void *job) "job %p"

qmp_block_stream(void *bs, void *job) "bs %p job %p"



# block/file-win32.c

# block/file-posix.c

file_paio_submit_co(int64_t offset, int count, int type) "offset %"PRId64" count %d type %d"

# file-posix.c

# file-win32.c

file_paio_submit(void *acb, void *opaque, int64_t offset, int count, int type) "acb %p opaque %p offset %"PRId64" count %d type %d"

file_copy_file_range(void *bs, int src, int64_t src_off, int dst, int64_t dst_off, int64_t bytes, int flags, int64_t ret) "bs %p src_fd %d offset %"PRIu64" dst_fd %d offset %"PRIu64" bytes %"PRIu64" flags %d ret %"PRId64



# block/qcow2.c

# qcow2.c

qcow2_writev_start_req(void *co, int64_t offset, int bytes) "co %p offset 0x%" PRIx64 " bytes %d"

qcow2_writev_done_req(void *co, int ret) "co %p ret %d"

qcow2_writev_start_part(void *co) "co %p"
@@ -70,7 +69,7 @@ qcow2_writev_data(void *co, uint64_t offset) "co %p offset 0x%" PRIx64 
qcow2_pwrite_zeroes_start_req(void *co, int64_t offset, int count) "co %p offset 0x%" PRIx64 " count %d"

qcow2_pwrite_zeroes(void *co, int64_t offset, int count) "co %p offset 0x%" PRIx64 " count %d"



# block/qcow2-cluster.c

# qcow2-cluster.c

qcow2_alloc_clusters_offset(void *co, uint64_t offset, int bytes) "co %p offset 0x%" PRIx64 " bytes %d"

qcow2_handle_copied(void *co, uint64_t guest_offset, uint64_t host_offset, uint64_t bytes) "co %p guest_offset 0x%" PRIx64 " host_offset 0x%" PRIx64 " bytes 0x%" PRIx64

qcow2_handle_alloc(void *co, uint64_t guest_offset, uint64_t host_offset, uint64_t bytes) "co %p guest_offset 0x%" PRIx64 " host_offset 0x%" PRIx64 " bytes 0x%" PRIx64
@@ -84,7 +83,7 @@ qcow2_l2_allocate_write_l2(void *bs, int l1_index) "bs %p l1_index %d" 
qcow2_l2_allocate_write_l1(void *bs, int l1_index) "bs %p l1_index %d"

qcow2_l2_allocate_done(void *bs, int l1_index, int ret) "bs %p l1_index %d ret %d"



# block/qcow2-cache.c

# qcow2-cache.c

qcow2_cache_get(void *co, int c, uint64_t offset, bool read_from_disk) "co %p is_l2_cache %d offset 0x%" PRIx64 " read_from_disk %d"

qcow2_cache_get_replace_entry(void *co, int c, int i) "co %p is_l2_cache %d index %d"

qcow2_cache_get_read(void *co, int c, int i) "co %p is_l2_cache %d index %d"
@@ -92,18 +91,18 @@ qcow2_cache_get_done(void *co, int c, int i) "co %p is_l2_cache %d index %d" 
qcow2_cache_flush(void *co, int c) "co %p is_l2_cache %d"

qcow2_cache_entry_flush(void *co, int c, int i) "co %p is_l2_cache %d index %d"



# block/qed-l2-cache.c

# qed-l2-cache.c

qed_alloc_l2_cache_entry(void *l2_cache, void *entry) "l2_cache %p entry %p"

qed_unref_l2_cache_entry(void *entry, int ref) "entry %p ref %d"

qed_find_l2_cache_entry(void *l2_cache, void *entry, uint64_t offset, int ref) "l2_cache %p entry %p offset %"PRIu64" ref %d"



# block/qed-table.c

# qed-table.c

qed_read_table(void *s, uint64_t offset, void *table) "s %p offset %"PRIu64" table %p"

qed_read_table_cb(void *s, void *table, int ret) "s %p table %p ret %d"

qed_write_table(void *s, uint64_t offset, void *table, unsigned int index, unsigned int n) "s %p offset %"PRIu64" table %p index %u n %u"

qed_write_table_cb(void *s, void *table, int flush, int ret) "s %p table %p flush %d ret %d"



# block/qed.c

# qed.c

qed_need_check_timer_cb(void *s) "s %p"

qed_start_need_check_timer(void *s) "s %p"

qed_cancel_need_check_timer(void *s) "s %p"
@@ -116,7 +115,7 @@ qed_aio_write_prefill(void *s, void *acb, uint64_t start, size_t len, uint64_t o 
qed_aio_write_postfill(void *s, void *acb, uint64_t start, size_t len, uint64_t offset) "s %p acb %p start %"PRIu64" len %zu offset %"PRIu64

qed_aio_write_main(void *s, void *acb, int ret, uint64_t offset, size_t len) "s %p acb %p ret %d offset %"PRIu64" len %zu"



# block/vxhs.c

# vxhs.c

vxhs_iio_callback(int error) "ctx is NULL: error %d"

vxhs_iio_callback_chnfail(int err, int error) "QNIO channel failed, no i/o %d, %d"

vxhs_iio_callback_unknwn(int opcode, int err) "unexpected opcode %d, errno %d"
@@ -133,7 +132,7 @@ vxhs_parse_uri_hostinfo(char *host, int port) "Host: IP %s, Port %d" 
vxhs_close(char *vdisk_guid) "Closing vdisk %s"

vxhs_get_creds(const char *cacert, const char *client_key, const char *client_cert) "cacert %s, client_key %s, client_cert %s"



# block/nvme.c

# nvme.c

nvme_kick(void *s, int queue) "s %p queue %d"

nvme_dma_flush_queue_wait(void *s) "s %p"

nvme_error(int cmd_specific, int sq_head, int sqid, int cid, int status) "cmd_specific %d sq_head %d sqid %d cid %d status 0x%x"
@@ -154,14 +153,14 @@ nvme_cmd_map_qiov(void *s, void *cmd, void *req, void *qiov, int entries) "s %p 
nvme_cmd_map_qiov_pages(void *s, int i, uint64_t page) "s %p page[%d] 0x%"PRIx64

nvme_cmd_map_qiov_iov(void *s, int i, void *page, int pages) "s %p iov[%d] %p pages %d"



# block/iscsi.c

# iscsi.c

iscsi_xcopy(void *src_lun, uint64_t src_off, void *dst_lun, uint64_t dst_off, uint64_t bytes, int ret) "src_lun %p offset %"PRIu64" dst_lun %p offset %"PRIu64" bytes %"PRIu64" ret %d"



# block/nbd-client.c

# nbd-client.c

nbd_read_reply_entry_fail(int ret, const char *err) "ret = %d, err: %s"

nbd_co_request_fail(uint64_t from, uint32_t len, uint64_t handle, uint16_t flags, uint16_t type, const char *name, int ret, const char *err) "Request failed { .from = %" PRIu64", .len = %" PRIu32 ", .handle = %" PRIu64 ", .flags = 0x%" PRIx16 ", .type = %" PRIu16 " (%s) } ret = %d, err: %s"



# block/ssh.c

# ssh.c

ssh_restart_coroutine(void *co) "co=%p"

ssh_flush(void) "fsync"

ssh_check_host_key_knownhosts(const char *key) "host key OK: %s"
@@ -178,7 +177,7 @@ ssh_write_buf(void *buf, size_t size) "sftp_write buf=%p size=%zu" 
ssh_write_return(ssize_t ret) "sftp_write returned %zd"

ssh_seek(int64_t offset) "seeking to offset=%" PRIi64



# block/curl.c

# curl.c

curl_timer_cb(long timeout_ms) "timer callback timeout_ms %ld"

curl_sock_cb(int action, int fd) "sock action %d on fd %d"

curl_read_cb(size_t realsize) "just reading %zu bytes"
@@ -187,14 +186,14 @@ curl_open_size(uint64_t size) "size = %" PRIu64 
curl_setup_preadv(uint64_t bytes, uint64_t start, const char *range) "reading %" PRIu64 " at %" PRIu64 " (%s)"

curl_close(void) "close"



# block/file-posix.c

# file-posix.c

file_xfs_write_zeroes(const char *error) "cannot write zero range (%s)"

file_xfs_discard(const char *error) "cannot punch hole (%s)"

file_FindEjectableOpticalMedia(const char *media) "Matching using %s"

file_setup_cdrom(const char *partition) "Using %s as optical disc"

file_hdev_is_sg(int type, int version) "SG device found: type=%d, version=%d"



# block/sheepdog.c

# sheepdog.c

sheepdog_reconnect_to_sdog(void) "Wait for connection to be established"

sheepdog_aio_read_response(void) "disable cache since the server doesn't support it"

sheepdog_open(uint32_t vid) "0x%" PRIx32 " snapshot inode was open"