From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:55279) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RGzJ8-00015o-FC for qemu-devel@nongnu.org; Thu, 20 Oct 2011 16:33:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RGzJ2-0000x2-0J for qemu-devel@nongnu.org; Thu, 20 Oct 2011 16:33:42 -0400 Received: from mail-yx0-f173.google.com ([209.85.213.173]:54430) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RGzJ1-0000wi-TE for qemu-devel@nongnu.org; Thu, 20 Oct 2011 16:33:35 -0400 Received: by yxk38 with SMTP id 38so3896669yxk.4 for ; Thu, 20 Oct 2011 13:33:35 -0700 (PDT) Message-ID: <4EA0859B.3050801@codemonkey.ws> Date: Thu, 20 Oct 2011 15:33:31 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <1319140558-8392-1-git-send-email-sw@weilnetz.de> In-Reply-To: <1319140558-8392-1-git-send-email-sw@weilnetz.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH] hw/9pfs: Fix broken compilation caused by wrong trace events List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Weil Cc: Harsh Prateek Bora , qemu-devel@nongnu.org On 10/20/2011 02:55 PM, Stefan Weil wrote: > Commit c572f23a3e7180dbeab5e86583e43ea2afed6271 added trace events > with mismatching format string and arguments. > > gcc reports these errors: > > In file included from trace.c:2:0: > trace.h: In function ‘trace_v9fs_attach’: > trace.h:2850:9: error: too many arguments for format [-Werror=format-extra-args] > trace.h: In function ‘trace_v9fs_wstat’: > trace.h:3039:9: error: too many arguments for format [-Werror=format-extra-args] > trace.h: In function ‘trace_v9fs_mkdir’: > trace.h:3088:9: error: too many arguments for format [-Werror=format-extra-args] > trace.h: In function ‘trace_v9fs_mkdir_return’: > trace.h:3095:9: error: too many arguments for format [-Werror=format-extra-args] > > Fix the format strings and also use %u instead of %d for unsigned values > in the changed strings. There are more minor errors of this kind > which I did not fix because that would make the review more difficult. > > v2: Fixed position of } for v9fs_mkdir_return. > > Cc: Harsh Prateek Bora > Signed-off-by: Stefan Weil Applied. Thanks. Regards, Anthony Liguori > --- > trace-events | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/trace-events b/trace-events > index fc13733..7f9cec4 100644 > --- a/trace-events > +++ b/trace-events > @@ -557,7 +557,7 @@ open_eth_desc_write(uint32_t addr, uint32_t v) "DESC[%04x]<- %08x" > complete_pdu(uint16_t tag, uint8_t id, int err) "tag %d id %d err %d" > v9fs_version(uint16_t tag, uint8_t id, int32_t msize, char* version) "tag %d id %d msize %d version %s" > v9fs_version_return(uint16_t tag, uint8_t id, int32_t msize, char* version) "tag %d id %d msize %d version %s" > -v9fs_attach(uint16_t tag, uint8_t id, int32_t fid, int32_t afid, char* uname, char* aname) "tag %d id %d fid %d afid %d aname %s" > +v9fs_attach(uint16_t tag, uint8_t id, int32_t fid, int32_t afid, char* uname, char* aname) "tag %u id %u fid %d afid %d uname %s aname %s" > v9fs_attach_return(uint16_t tag, uint8_t id, int8_t type, int32_t version, int64_t path) "tag %d id %d type %d version %d path %"PRId64"" > v9fs_stat(uint16_t tag, uint8_t id, int32_t fid) "tag %d id %d fid %d" > v9fs_stat_return(uint16_t tag, uint8_t id, int32_t mode, int32_t atime, int32_t mtime, int64_t length) "tag %d id %d stat={mode %d atime %d mtime %d length %"PRId64"}" > @@ -584,15 +584,15 @@ v9fs_symlink_return(uint16_t tag, uint8_t id, int8_t type, int32_t version, int6 > v9fs_flush(uint16_t tag, uint8_t id, int16_t flush_tag) "tag %d id %d flush_tag %d" > v9fs_link(uint16_t tag, uint8_t id, int32_t dfid, int32_t oldfid, char* name) "tag %d id %d dfid %d oldfid %d name %s" > v9fs_remove(uint16_t tag, uint8_t id, int32_t fid) "tag %d id %d fid %d" > -v9fs_wstat(uint16_t tag, uint8_t id, int32_t fid, int32_t mode, int32_t atime, int32_t mtime) "tag %d id %d fid %d stat={mode %d atime %d mtime}" > +v9fs_wstat(uint16_t tag, uint8_t id, int32_t fid, int32_t mode, int32_t atime, int32_t mtime) "tag %u id %u fid %d stat={mode %d atime %d mtime %d}" > v9fs_mknod(uint16_t tag, uint8_t id, int32_t fid, int mode, int major, int minor) "tag %d id %d fid %d mode %d major %d minor %d" > v9fs_mknod_return(uint16_t tag, uint8_t id, int8_t type, int32_t version, int64_t path) "tag %d id %d qid={type %d version %d path %"PRId64"}" > v9fs_lock(uint16_t tag, uint8_t id, int32_t fid, uint8_t type, uint64_t start, uint64_t length) "tag %d id %d fid %d type %d start %"PRIu64" length %"PRIu64"" > v9fs_lock_return(uint16_t tag, uint8_t id, int8_t status) "tag %d id %d status %d" > v9fs_getlock(uint16_t tag, uint8_t id, int32_t fid, uint8_t type, uint64_t start, uint64_t length)"tag %d id %d fid %d type %d start %"PRIu64" length %"PRIu64"" > v9fs_getlock_return(uint16_t tag, uint8_t id, uint8_t type, uint64_t start, uint64_t length, uint32_t proc_id) "tag %d id %d type %d start %"PRIu64" length %"PRIu64" proc_id %u" > -v9fs_mkdir(uint16_t tag, uint8_t id, int32_t fid, char* name, int mode, uint32_t gid) "tag %d id %d fid %d name %s mode %d" > -v9fs_mkdir_return(uint16_t tag, uint8_t id, int8_t type, int32_t version, int64_t path, int err) "tag %d id %d qid={type %d version %d path %"PRId64"}" > +v9fs_mkdir(uint16_t tag, uint8_t id, int32_t fid, char* name, int mode, uint32_t gid) "tag %u id %u fid %d name %s mode %d gid %u" > +v9fs_mkdir_return(uint16_t tag, uint8_t id, int8_t type, int32_t version, int64_t path, int err) "tag %u id %u qid={type %d version %d path %"PRId64"} err %d" > v9fs_xattrwalk(uint16_t tag, uint8_t id, int32_t fid, int32_t newfid, char* name) "tag %d id %d fid %d newfid %d name %s" > v9fs_xattrwalk_return(uint16_t tag, uint8_t id, int64_t size) "tag %d id %d size %"PRId64"" > v9fs_xattrcreate(uint16_t tag, uint8_t id, int32_t fid, char* name, int64_t size, int flags) "tag %d id %d fid %d name %s size %"PRId64" flags %d"