Commit 8e6a243a authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-4.2-pull-request' into staging 



fix translation of statx structures

# gpg: Signature made Mon 25 Nov 2019 16:29:55 GMT
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/linux-user-for-4.2-pull-request:
  linux-user: fix translation of statx structures

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 4ecc9842 d1e26707

linux-user/syscall.c

+6 −6
Original line number Diff line number Diff line
@@ -6743,12 +6743,12 @@ static inline abi_long host_to_target_statx(struct target_statx *host_stx, 
    __put_user(host_stx->stx_attributes_mask, &target_stx->stx_attributes_mask);

    __put_user(host_stx->stx_atime.tv_sec, &target_stx->stx_atime.tv_sec);

    __put_user(host_stx->stx_atime.tv_nsec, &target_stx->stx_atime.tv_nsec);

    __put_user(host_stx->stx_btime.tv_sec, &target_stx->stx_atime.tv_sec);

    __put_user(host_stx->stx_btime.tv_nsec, &target_stx->stx_atime.tv_nsec);

    __put_user(host_stx->stx_ctime.tv_sec, &target_stx->stx_atime.tv_sec);

    __put_user(host_stx->stx_ctime.tv_nsec, &target_stx->stx_atime.tv_nsec);

    __put_user(host_stx->stx_mtime.tv_sec, &target_stx->stx_atime.tv_sec);

    __put_user(host_stx->stx_mtime.tv_nsec, &target_stx->stx_atime.tv_nsec);

    __put_user(host_stx->stx_btime.tv_sec, &target_stx->stx_btime.tv_sec);

    __put_user(host_stx->stx_btime.tv_nsec, &target_stx->stx_btime.tv_nsec);

    __put_user(host_stx->stx_ctime.tv_sec, &target_stx->stx_ctime.tv_sec);

    __put_user(host_stx->stx_ctime.tv_nsec, &target_stx->stx_ctime.tv_nsec);

    __put_user(host_stx->stx_mtime.tv_sec, &target_stx->stx_mtime.tv_sec);

    __put_user(host_stx->stx_mtime.tv_nsec, &target_stx->stx_mtime.tv_nsec);

    __put_user(host_stx->stx_rdev_major, &target_stx->stx_rdev_major);

    __put_user(host_stx->stx_rdev_minor, &target_stx->stx_rdev_minor);

    __put_user(host_stx->stx_dev_major, &target_stx->stx_dev_major);