qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Hannes Reinecke <hare@suse.de>
Subject: [Qemu-devel] [PULL 05/35] megasas: simplify trace event messages
Date: Fri, 31 Oct 2014 18:25:43 +0100	[thread overview]
Message-ID: <1414776373-9704-6-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1414776373-9704-1-git-send-email-pbonzini@redhat.com>

From: Hannes Reinecke <hare@suse.de>

The trace events already contain the function name, so the actual
message doesn't need to contain any of these informations.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 trace-events | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/trace-events b/trace-events
index 6c3a400..c5ebfc8 100644
--- a/trace-events
+++ b/trace-events
@@ -698,34 +698,34 @@ megasas_init_firmware(uint64_t pa) "pa %" PRIx64 " "
 megasas_init_queue(uint64_t queue_pa, int queue_len, uint64_t head, uint64_t tail, uint32_t flags) "queue at %" PRIx64 " len %d head %" PRIx64 " tail %" PRIx64 " flags %x"
 megasas_initq_map_failed(int frame) "scmd %d: failed to map queue"
 megasas_initq_mismatch(int queue_len, int fw_cmds) "queue size %d max fw cmds %d"
-megasas_qf_found(unsigned int index, uint64_t pa) "found mapped frame %x pa %" PRIx64 ""
+megasas_qf_found(unsigned int index, uint64_t pa) "mapped frame %x pa %" PRIx64 ""
 megasas_qf_new(unsigned int index, void *cmd) "return new frame %x cmd %p"
 megasas_qf_failed(unsigned long pa) "all frames busy for frame %lx"
 megasas_qf_enqueue(unsigned int index, unsigned int count, uint64_t context, unsigned int tail, int busy) "enqueue frame %x count %d context %" PRIx64 " tail %x busy %d"
-megasas_qf_update(unsigned int head, unsigned int busy) "update reply queue head %x busy %d"
+megasas_qf_update(unsigned int head, unsigned int busy) "reply queue head %x busy %d"
 megasas_qf_map_failed(int cmd, unsigned long frame) "scmd %d: frame %lu"
 megasas_qf_complete_noirq(uint64_t context) "context %" PRIx64 " "
 megasas_qf_complete(uint64_t context, unsigned int tail, unsigned int offset, int busy, unsigned int doorbell) "context %" PRIx64 " tail %x offset %d busy %d doorbell %x"
 megasas_frame_busy(uint64_t addr) "frame %" PRIx64 " busy"
-megasas_unhandled_frame_cmd(int cmd, uint8_t frame_cmd) "scmd %d: Unhandled MFI cmd %x"
+megasas_unhandled_frame_cmd(int cmd, uint8_t frame_cmd) "scmd %d: MFI cmd %x"
 megasas_handle_scsi(const char *frame, int bus, int dev, int lun, void *sdev, unsigned long size) "%s dev %x/%x/%x sdev %p xfer %lu"
-megasas_scsi_target_not_present(const char *frame, int bus, int dev, int lun) "%s dev %x/%x/%x target not present"
+megasas_scsi_target_not_present(const char *frame, int bus, int dev, int lun) "%s dev %x/%x/%x"
 megasas_scsi_invalid_cdb_len(const char *frame, int bus, int dev, int lun, int len) "%s dev %x/%x/%x invalid cdb len %d"
 megasas_iov_read_overflow(int cmd, int bytes, int len) "scmd %d: %d/%d bytes"
 megasas_iov_write_overflow(int cmd, int bytes, int len) "scmd %d: %d/%d bytes"
 megasas_iov_read_underflow(int cmd, int bytes, int len) "scmd %d: %d/%d bytes"
 megasas_iov_write_underflow(int cmd, int bytes, int len) "scmd %d: %d/%d bytes"
-megasas_scsi_req_alloc_failed(const char *frame, int dev, int lun) "%s dev %x/%x req allocation failed"
+megasas_scsi_req_alloc_failed(const char *frame, int dev, int lun) "%s dev %x/%x"
 megasas_scsi_read_start(int cmd, int len) "scmd %d: transfer %d bytes of data"
 megasas_scsi_write_start(int cmd, int len) "scmd %d: transfer %d bytes of data"
 megasas_scsi_nodata(int cmd) "scmd %d: no data to be transferred"
-megasas_scsi_complete(int cmd, uint32_t status, int len, int xfer) "scmd %d: finished with status %x, len %u/%u"
-megasas_command_complete(int cmd, uint32_t status, uint32_t resid) "scmd %d: command completed, status %x, residual %d"
+megasas_scsi_complete(int cmd, uint32_t status, int len, int xfer) "scmd %d: status %x, len %u/%u"
+megasas_command_complete(int cmd, uint32_t status, uint32_t resid) "scmd %d: status %x, residual %d"
 megasas_handle_io(int cmd, const char *frame, int dev, int lun, unsigned long lba, unsigned long count) "scmd %d: %s dev %x/%x lba %lx count %lu"
 megasas_io_target_not_present(int cmd, const char *frame, int dev, int lun) "scmd %d: %s dev 1/%x/%x LUN not present"
 megasas_io_read_start(int cmd, unsigned long lba, unsigned long count, unsigned long len) "scmd %d: start LBA %lx %lu blocks (%lu bytes)"
 megasas_io_write_start(int cmd, unsigned long lba, unsigned long count, unsigned long len) "scmd %d: start LBA %lx %lu blocks (%lu bytes)"
-megasas_io_complete(int cmd, uint32_t len) "scmd %d: %d bytes completed"
+megasas_io_complete(int cmd, uint32_t len) "scmd %d: %d bytes"
 megasas_iovec_sgl_overflow(int cmd, int index, int limit) "scmd %d: iovec count %d limit %d"
 megasas_iovec_sgl_underflow(int cmd, int index) "scmd %d: iovec count %d"
 megasas_iovec_sgl_invalid(int cmd, int index, uint64_t pa, uint32_t len) "scmd %d: element %d pa %" PRIx64 " len %u"
@@ -733,25 +733,25 @@ megasas_iovec_overflow(int cmd, int len, int limit) "scmd %d: len %d limit %d"
 megasas_iovec_underflow(int cmd, int len, int limit) "scmd %d: len %d limit %d"
 megasas_handle_dcmd(int cmd, int opcode) "scmd %d: MFI DCMD opcode %x"
 megasas_finish_dcmd(int cmd, int size) "scmd %d: MFI DCMD wrote %d bytes"
-megasas_dcmd_req_alloc_failed(int cmd, const char *desc) "scmd %d: %s alloc failed"
+megasas_dcmd_req_alloc_failed(int cmd, const char *desc) "scmd %d: %s"
 megasas_dcmd_internal_submit(int cmd, const char *desc, int dev) "scmd %d: %s to dev %d"
-megasas_dcmd_internal_finish(int cmd, int opcode, int lun) "scmd %d: DCMD finish internal cmd %x lun %d"
-megasas_dcmd_internal_invalid(int cmd, int opcode) "scmd %d: Invalid internal DCMD %x"
+megasas_dcmd_internal_finish(int cmd, int opcode, int lun) "scmd %d: cmd %x lun %d"
+megasas_dcmd_internal_invalid(int cmd, int opcode) "scmd %d: DCMD %x"
 megasas_dcmd_unhandled(int cmd, int opcode, int len) "scmd %d: opcode %x, len %d"
 megasas_dcmd_zero_sge(int cmd) "scmd %d: zero DCMD sge count"
-megasas_dcmd_invalid_sge(int cmd, int count) "scmd %d: invalid DCMD sge count %d"
-megasas_dcmd_invalid_xfer_len(int cmd, unsigned long size, unsigned long max) "scmd %d: invalid xfer len %ld, max %ld"
+megasas_dcmd_invalid_sge(int cmd, int count) "scmd %d: DCMD sge count %d"
+megasas_dcmd_invalid_xfer_len(int cmd, unsigned long size, unsigned long max) "scmd %d: xfer len %ld, max %ld"
 megasas_dcmd_enter(int cmd, const char *dcmd, int len) "scmd %d: DCMD %s len %d"
-megasas_dcmd_dummy(int cmd, unsigned long size) "scmd %d: DCMD dummy xfer len %ld"
+megasas_dcmd_dummy(int cmd, unsigned long size) "scmd %d: xfer len %ld"
 megasas_dcmd_set_fw_time(int cmd, unsigned long time) "scmd %d: Set FW time %lx"
 megasas_dcmd_pd_get_list(int cmd, int num, int max, int offset) "scmd %d: DCMD PD get list: %d / %d PDs, size %d"
 megasas_dcmd_ld_get_list(int cmd, int num, int max) "scmd %d: DCMD LD get list: found %d / %d LDs"
-megasas_dcmd_ld_get_info(int cmd, int ld_id) "scmd %d: DCMD LD get info for dev %d"
-megasas_dcmd_pd_get_info(int cmd, int pd_id) "scmd %d: DCMD PD get info for dev %d"
-megasas_dcmd_pd_list_query(int cmd, int flags) "scmd %d: DCMD PD list query flags %x"
-megasas_dcmd_ld_list_query(int cmd, int flags) "scmd %d: DCMD LD list query flags %x"
+megasas_dcmd_ld_get_info(int cmd, int ld_id) "scmd %d: dev %d"
+megasas_dcmd_ld_list_query(int cmd, int flags) "scmd %d: query flags %x"
+megasas_dcmd_pd_get_info(int cmd, int pd_id) "scmd %d: dev %d"
+megasas_dcmd_pd_list_query(int cmd, int flags) "scmd %d: query flags %x"
 megasas_dcmd_unsupported(int cmd, unsigned long size) "scmd %d: set properties len %ld"
-megasas_abort_frame(int cmd, int abort_cmd) "scmd %d: aborting frame %x"
+megasas_abort_frame(int cmd, int abort_cmd) "scmd %d: frame %x"
 megasas_abort_no_cmd(int cmd, uint64_t context) "scmd %d: no active command for frame context %" PRIx64 ""
 megasas_abort_invalid_context(int cmd, uint64_t context, int abort_cmd) "scmd %d: invalid frame context %" PRIx64 " for abort frame %x"
 megasas_reset(void) "Reset"
-- 
1.8.3.1

  parent reply	other threads:[~2014-10-31 17:26 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-31 17:25 [Qemu-devel] [PULL 00/35] Last batch of SCSI, KVM, ivshmem patches before soft freeze Paolo Bonzini
2014-10-31 17:25 ` [Qemu-devel] [PULL 01/35] rules.mak: Allow .mo-objs and .mo-cflags in -y variables Paolo Bonzini
2014-10-31 17:25 ` [Qemu-devel] [PULL 02/35] ui: Use the new ".mo-cflags" rule syntax for SDL_CFLAGS Paolo Bonzini
2014-10-31 17:25 ` [Qemu-devel] [PULL 03/35] scsi: Rename scsi_*_length() to scsi_*_xfer(), add scsi_cdb_length() Paolo Bonzini
2014-10-31 17:25 ` [Qemu-devel] [PULL 04/35] megasas: fixup MFI_DCMD_LD_LIST_QUERY Paolo Bonzini
2014-10-31 17:25 ` Paolo Bonzini [this message]
2014-10-31 17:25 ` [Qemu-devel] [PULL 06/35] megasas: fixup device mapping Paolo Bonzini
2014-10-31 17:25 ` [Qemu-devel] [PULL 07/35] megasas: add MegaRAID SAS 2108 emulation Paolo Bonzini
2014-10-31 17:25 ` [Qemu-devel] [PULL 08/35] megasas: Fix typo in megasas_dcmd_ld_get_list() Paolo Bonzini
2014-10-31 17:25 ` [Qemu-devel] [PULL 09/35] megasas: Decode register names Paolo Bonzini
2014-10-31 17:25 ` [Qemu-devel] [PULL 10/35] megasas: Clear unit attention on initial reset Paolo Bonzini
2014-10-31 17:25 ` [Qemu-devel] [PULL 11/35] megasas: Ignore duplicate init_firmware commands Paolo Bonzini
2014-10-31 17:25 ` [Qemu-devel] [PULL 12/35] megasas: Implement DCMD_CLUSTER_RESET_LD Paolo Bonzini
2014-10-31 17:25 ` [Qemu-devel] [PULL 13/35] megasas: Update queue logging Paolo Bonzini
2014-10-31 17:25 ` [Qemu-devel] [PULL 14/35] megasas: Rework frame queueing algorithm Paolo Bonzini
2014-10-31 17:25 ` [Qemu-devel] [PULL 15/35] megasas: Fixup MSI-X handling Paolo Bonzini
2014-10-31 17:25 ` [Qemu-devel] [PULL 16/35] -machine vmport=off: Allow disabling of VMWare ioport emulation Paolo Bonzini
2014-10-31 17:25 ` [Qemu-devel] [PULL 17/35] Add skip_dump flag to ignore memory region during dump Paolo Bonzini
2014-10-31 17:25 ` [Qemu-devel] [PULL 18/35] vl.c: Fix Coverity complaining for vmstate_dump_file Paolo Bonzini
2014-10-31 17:25 ` [Qemu-devel] [PULL 19/35] kvmvapic: patch_instruction fix Paolo Bonzini
2014-10-31 17:25 ` [Qemu-devel] [PULL 20/35] iscsi: Refuse to open as writable if the LUN is write protected Paolo Bonzini
2014-10-31 17:25 ` [Qemu-devel] [PULL 21/35] virtio-scsi: Fix memory leak when realize failed Paolo Bonzini
2014-10-31 17:26 ` [Qemu-devel] [PULL 22/35] scsi: devirtualize unrealize of SCSI devices Paolo Bonzini
2014-10-31 17:26 ` [Qemu-devel] [PULL 23/35] virtio-scsi: Fix num_queue input validation Paolo Bonzini
2014-10-31 17:26 ` [Qemu-devel] [PULL 24/35] kvm_stat: Only consider online cpus Paolo Bonzini
2014-10-31 17:26 ` [Qemu-devel] [PULL 25/35] kvm_stat: Fix the non-x86 exit reasons Paolo Bonzini
2014-10-31 17:26 ` [Qemu-devel] [PULL 26/35] kvm_stat: Rework platform detection Paolo Bonzini
2014-10-31 17:26 ` [Qemu-devel] [PULL 27/35] kvm_stat: Abstract ioctl numbers Paolo Bonzini
2014-10-31 17:26 ` [Qemu-devel] [PULL 28/35] kvm_stat: Add powerpc support Paolo Bonzini
2014-10-31 17:26 ` [Qemu-devel] [PULL 29/35] i386: fix breakpoints handling in icount mode Paolo Bonzini
2014-10-31 17:26 ` [Qemu-devel] [PULL 30/35] ivshmem: Check ivshmem_read() size argument Paolo Bonzini
2014-10-31 17:26 ` [Qemu-devel] [PULL 31/35] ivshmem: validate incoming_posn value from server Paolo Bonzini
2014-10-31 17:26 ` [Qemu-devel] [PULL 32/35] ivshmem: Fix potential OOB r/w access Paolo Bonzini
2014-10-31 17:26 ` [Qemu-devel] [PULL 33/35] ivshmem: Fix fd leak on error Paolo Bonzini
2014-10-31 17:26 ` [Qemu-devel] [PULL 34/35] ivshmem: use error_report Paolo Bonzini
2014-10-31 17:26 ` [Qemu-devel] [PULL 35/35] virtio-scsi: fix dataplane Paolo Bonzini
2014-11-03 14:54 ` [Qemu-devel] [PULL 00/35] Last batch of SCSI, KVM, ivshmem patches before soft freeze Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1414776373-9704-6-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=hare@suse.de \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).