[Qemu-devel] [PULL 0/1] 9p patches for 2.13 20180502

[Qemu-devel] [PULL 0/1] 9p patches for 2.13 20180502

[Greg Kurz]

The following changes since commit 26bd8d98c4b3284a4c6fe3b67c98b1edd00e9beb:

  Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.13-pull-request' into staging (2018-05-01 15:26:06 +0100)

are available in the Git repository at:

  https://github.com/gkurz/qemu.git tags/for-upstream

for you to fetch changes up to 8f9c64bfa584ab66b8bcbfc162efa179f7f1cd41:

  9p: add trace event for v9fs_setattr() (2018-05-02 08:59:24 +0200)

----------------------------------------------------------------
Just one trace

----------------------------------------------------------------
Greg Kurz (1):
      9p: add trace event for v9fs_setattr()

 hw/9pfs/9p.c         | 5 +++++
 hw/9pfs/trace-events | 2 ++
 2 files changed, 7 insertions(+)
-- 
2.14.3

[Qemu-devel] [PULL 1/1] 9p: add trace event for v9fs_setattr()

[Greg Kurz]

Don't print the tv_nsec part of atime and mtime, to stay below the 10
argument limit of trace events.

Signed-off-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/9pfs/9p.c         | 5 +++++
 hw/9pfs/trace-events | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index 48fa48e72074..d74302deeba5 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -1195,6 +1195,10 @@ static void coroutine_fn v9fs_setattr(void *opaque)
         goto out_nofid;
     }
 
+    trace_v9fs_setattr(pdu->tag, pdu->id, fid,
+                       v9iattr.valid, v9iattr.mode, v9iattr.uid, v9iattr.gid,
+                       v9iattr.size, v9iattr.atime_sec, v9iattr.mtime_sec);
+
     fidp = get_fid(pdu, fid);
     if (fidp == NULL) {
         err = -EINVAL;
@@ -1259,6 +1263,7 @@ static void coroutine_fn v9fs_setattr(void *opaque)
         }
     }
     err = offset;
+    trace_v9fs_setattr_return(pdu->tag, pdu->id);
 out:
     put_fid(pdu, fidp);
 out_nofid:
diff --git a/hw/9pfs/trace-events b/hw/9pfs/trace-events
index 1aee350c42f1..881e4c4dd80b 100644
--- a/hw/9pfs/trace-events
+++ b/hw/9pfs/trace-events
@@ -46,3 +46,5 @@ v9fs_xattrwalk_return(uint16_t tag, uint8_t id, int64_t size) "tag %d id %d size
 v9fs_xattrcreate(uint16_t tag, uint8_t id, int32_t fid, char* name, uint64_t size, int flags) "tag %d id %d fid %d name %s size %"PRIu64" flags %d"
 v9fs_readlink(uint16_t tag, uint8_t id, int32_t fid) "tag %d id %d fid %d"
 v9fs_readlink_return(uint16_t tag, uint8_t id, char* target) "tag %d id %d name %s"
+v9fs_setattr(uint16_t tag, uint8_t id, int32_t fid, int32_t valid, int32_t mode, int32_t uid, int32_t gid, int64_t size, int64_t atime_sec, int64_t mtime_sec) "tag %u id %u fid %d iattr={valid %d mode %d uid %d gid %d size %"PRId64" atime=%"PRId64" mtime=%"PRId64" }"
+v9fs_setattr_return(uint16_t tag, uint8_t id) "tag %u id %u"
-- 
2.14.3

Re: [Qemu-devel] [PULL 0/1] 9p patches for 2.13 20180502

[Peter Maydell]

On 2 May 2018 at 12:13, Greg Kurz <groug@kaod.org> wrote:
> The following changes since commit 26bd8d98c4b3284a4c6fe3b67c98b1edd00e9beb:
>
>   Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.13-pull-request' into staging (2018-05-01 15:26:06 +0100)
>
> are available in the Git repository at:
>
>   https://github.com/gkurz/qemu.git tags/for-upstream
>
> for you to fetch changes up to 8f9c64bfa584ab66b8bcbfc162efa179f7f1cd41:
>
>   9p: add trace event for v9fs_setattr() (2018-05-02 08:59:24 +0200)
>
> ----------------------------------------------------------------
> Just one trace
>
> ----------------------------------------------------------------
> Greg Kurz (1):
>       9p: add trace event for v9fs_setattr()
>
>  hw/9pfs/9p.c         | 5 +++++
>  hw/9pfs/trace-events | 2 ++
>  2 files changed, 7 insertions(+)

Applied, thanks.

-- PMM