From nobody Mon Feb 9 12:11:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1527817170818407.2105628412936; Thu, 31 May 2018 18:39:30 -0700 (PDT) Received: from localhost ([::1]:46941 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOZ2M-000307-Sr for importer@patchew.org; Thu, 31 May 2018 21:39:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33361) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOYr3-00033l-3Q for qemu-devel@nongnu.org; Thu, 31 May 2018 21:27:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fOYr1-00034X-1q for qemu-devel@nongnu.org; Thu, 31 May 2018 21:27:45 -0400 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:32772) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fOYr0-000348-SC for qemu-devel@nongnu.org; Thu, 31 May 2018 21:27:42 -0400 Received: by mail-qk0-x244.google.com with SMTP id h7-v6so11577115qkm.0 for ; Thu, 31 May 2018 18:27:42 -0700 (PDT) Received: from localhost.localdomain (96-86-104-61-static.hfc.comcastbusiness.net. [96.86.104.61]) by smtp.gmail.com with ESMTPSA id o68-v6sm2003842qkc.19.2018.05.31.18.27.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 31 May 2018 18:27:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juliacomputing-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=7rOcwMMLBYxlFhZR6LiH7C46Zpzdyri90EpUDCKW6C0=; b=khmaPiB1pw59N7NfxWX6Nh89OIuf+MK0B08b7sLHSc599QcOzc8ywK5BNWjcnfamqB TAJ3kalFBti7w1oAsBxhgE1PnuPUY9x/rrJylqSYqPLK2v4M5xhCtlfeRPRzWVapya9L 6lvJEjsbeKP5lEaA7mMN57RNEjL93G52Kcxv4QpRoZpKDUZxetQHT3OskaYFn3UG8k7n ZzY+yOX9r2Slz9kLmeNGXlIQFO/3HAp1xe6FYAhm/rlP2zB66ReHS2YEXBPWRn9L4VQR WrCsByjGYi2QlP7PX+f/A2IDKYzoenIlF2K0WUV9NTflSWZn3ALt4+4hxxHDWP/Gwu3L U3Ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=7rOcwMMLBYxlFhZR6LiH7C46Zpzdyri90EpUDCKW6C0=; b=BLQEEvJzf13caMyPfQuIKsz01RvGi0ZlZP5OWsGzpwu/lSwc4IGurqHA1UpMY46kny I1zI5pS+zQhzeFgwV5Z0pbbNo8y47WoQzDCMOutKj9woQaK2z09SmQDejMCHwDD6INHs GNCD8rsOL7DqeVE4s5TRww97Z256YxhmPAsmN3KlMVrjg4tjwrL0bToi63V+/h7IwSjM a1X6g2Vj8LRg89A+5E7bD+wBrvOGaONThmgWKf67ew4XMFHtRpF1RBxNACLfLCTJ/rXW KucaE7kX2ewu9+TC3DeDe1kR6Z63lYRWApIfG2dpp/MvbHa+GjgP0EFr9Tqkj0/elusK RTOw== X-Gm-Message-State: APt69E1oYi3SmmQbPZ4oM/sPsZa7EKK76mhV6nmqehPesay1vdXUUMB0 bCT98Hvguv7XtXSp9HxtxAjRr6sAiZ0= X-Google-Smtp-Source: ADUXVKJWK/E56s30P9b3cuZzbyVHkF2c5+8frmS8QV0085latb/hdcKbCwUR4XpCOUHAmQmtHv6Img== X-Received: by 2002:a37:4788:: with SMTP id u130-v6mr8815848qka.301.1527816461907; Thu, 31 May 2018 18:27:41 -0700 (PDT) From: Keno Fischer To: qemu-devel@nongnu.org Date: Thu, 31 May 2018 21:26:05 -0400 Message-Id: <0257b0ef53ac4c12f1ca29a86b2ff3276853be32.1527814874.git.keno@juliacomputing.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::244 Subject: [Qemu-devel] [PATCH v2 10/20] 9p: darwin: Handle struct stat(fs) differences X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Keno Fischer , groug@kaod.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Keno Fischer --- Changes since v1: * Now also covers fsdev/virtfs-proxy-helper.c fsdev/virtfs-proxy-helper.c | 14 +++++++++++--- hw/9pfs/9p-proxy.c | 17 ++++++++++++++--- hw/9pfs/9p-synth.c | 2 ++ hw/9pfs/9p.c | 16 ++++++++++++++-- 4 files changed, 41 insertions(+), 8 deletions(-) diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c index 94fb069..3bc1269 100644 --- a/fsdev/virtfs-proxy-helper.c +++ b/fsdev/virtfs-proxy-helper.c @@ -506,12 +506,15 @@ static void stat_to_prstat(ProxyStat *pr_stat, struct= stat *stat) pr_stat->st_size =3D stat->st_size; pr_stat->st_blksize =3D stat->st_blksize; pr_stat->st_blocks =3D stat->st_blocks; +#ifdef CONFIG_DARWIN + pr_stat->st_atim_nsec =3D stat->st_atimespec.tv_nsec; + pr_stat->st_mtim_nsec =3D stat->st_mtimespec.tv_nsec; + pr_stat->st_ctim_nsec =3D stat->st_ctimespec.tv_nsec; +#else pr_stat->st_atim_sec =3D stat->st_atim.tv_sec; - pr_stat->st_atim_nsec =3D stat->st_atim.tv_nsec; pr_stat->st_mtim_sec =3D stat->st_mtim.tv_sec; - pr_stat->st_mtim_nsec =3D stat->st_mtim.tv_nsec; pr_stat->st_ctim_sec =3D stat->st_ctim.tv_sec; - pr_stat->st_ctim_nsec =3D stat->st_ctim.tv_nsec; +#endif } =20 static void statfs_to_prstatfs(ProxyStatFS *pr_stfs, struct statfs *stfs) @@ -524,10 +527,15 @@ static void statfs_to_prstatfs(ProxyStatFS *pr_stfs, = struct statfs *stfs) pr_stfs->f_bavail =3D stfs->f_bavail; pr_stfs->f_files =3D stfs->f_files; pr_stfs->f_ffree =3D stfs->f_ffree; +#ifdef CONFIG_DARWIN + pr_stfs->f_fsid[0] =3D stfs->f_fsid.val[0]; + pr_stfs->f_fsid[1] =3D stfs->f_fsid.val[1]; +#else pr_stfs->f_fsid[0] =3D stfs->f_fsid.__val[0]; pr_stfs->f_fsid[1] =3D stfs->f_fsid.__val[1]; pr_stfs->f_namelen =3D stfs->f_namelen; pr_stfs->f_frsize =3D stfs->f_frsize; +#endif } =20 /* diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c index 47a94e0..8a2c174 100644 --- a/hw/9pfs/9p-proxy.c +++ b/hw/9pfs/9p-proxy.c @@ -117,10 +117,15 @@ static void prstatfs_to_statfs(struct statfs *stfs, P= roxyStatFS *prstfs) stfs->f_bavail =3D prstfs->f_bavail; stfs->f_files =3D prstfs->f_files; stfs->f_ffree =3D prstfs->f_ffree; +#ifdef CONFIG_DARWIN + stfs->f_fsid.val[0] =3D prstfs->f_fsid[0] & 0xFFFFFFFFU; + stfs->f_fsid.val[1] =3D prstfs->f_fsid[1] >> 32 & 0xFFFFFFFFU; +#else stfs->f_fsid.__val[0] =3D prstfs->f_fsid[0] & 0xFFFFFFFFU; stfs->f_fsid.__val[1] =3D prstfs->f_fsid[1] >> 32 & 0xFFFFFFFFU; stfs->f_namelen =3D prstfs->f_namelen; stfs->f_frsize =3D prstfs->f_frsize; +#endif } =20 /* Converts proxy_stat structure to VFS stat structure */ @@ -137,12 +142,18 @@ static void prstat_to_stat(struct stat *stbuf, ProxyS= tat *prstat) stbuf->st_size =3D prstat->st_size; stbuf->st_blksize =3D prstat->st_blksize; stbuf->st_blocks =3D prstat->st_blocks; - stbuf->st_atim.tv_sec =3D prstat->st_atim_sec; - stbuf->st_atim.tv_nsec =3D prstat->st_atim_nsec; + stbuf->st_atime =3D prstat->st_atim_sec; stbuf->st_mtime =3D prstat->st_mtim_sec; - stbuf->st_mtim.tv_nsec =3D prstat->st_mtim_nsec; stbuf->st_ctime =3D prstat->st_ctim_sec; +#ifdef CONFIG_DARWIN + stbuf->st_atimespec.tv_nsec =3D prstat->st_atim_nsec; + stbuf->st_mtimespec.tv_nsec =3D prstat->st_mtim_nsec; + stbuf->st_ctimespec.tv_nsec =3D prstat->st_ctim_nsec; +#else + stbuf->st_atim.tv_nsec =3D prstat->st_atim_nsec; + stbuf->st_mtim.tv_nsec =3D prstat->st_mtim_nsec; stbuf->st_ctim.tv_nsec =3D prstat->st_ctim_nsec; +#endif } =20 /* diff --git a/hw/9pfs/9p-synth.c b/hw/9pfs/9p-synth.c index 54239c9..eb68b42 100644 --- a/hw/9pfs/9p-synth.c +++ b/hw/9pfs/9p-synth.c @@ -426,7 +426,9 @@ static int synth_statfs(FsContext *s, V9fsPath *fs_path, stbuf->f_bsize =3D 512; stbuf->f_blocks =3D 0; stbuf->f_files =3D synth_node_count; +#ifndef CONFIG_DARWIN stbuf->f_namelen =3D NAME_MAX; +#endif return 0; } =20 diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index a757374..212f569 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -905,11 +905,17 @@ static void stat_to_v9stat_dotl(V9fsState *s, const s= truct stat *stbuf, v9lstat->st_blksize =3D stbuf->st_blksize; v9lstat->st_blocks =3D stbuf->st_blocks; v9lstat->st_atime_sec =3D stbuf->st_atime; - v9lstat->st_atime_nsec =3D stbuf->st_atim.tv_nsec; v9lstat->st_mtime_sec =3D stbuf->st_mtime; - v9lstat->st_mtime_nsec =3D stbuf->st_mtim.tv_nsec; v9lstat->st_ctime_sec =3D stbuf->st_ctime; +#ifdef CONFIG_DARWIN + v9lstat->st_atime_nsec =3D stbuf->st_atimespec.tv_nsec; + v9lstat->st_mtime_nsec =3D stbuf->st_mtimespec.tv_nsec; + v9lstat->st_ctime_nsec =3D stbuf->st_ctimespec.tv_nsec; +#else + v9lstat->st_atime_nsec =3D stbuf->st_atim.tv_nsec; + v9lstat->st_mtime_nsec =3D stbuf->st_mtim.tv_nsec; v9lstat->st_ctime_nsec =3D stbuf->st_ctim.tv_nsec; +#endif /* Currently we only support BASIC fields in stat */ v9lstat->st_result_mask =3D P9_STATS_BASIC; =20 @@ -2959,9 +2965,15 @@ static int v9fs_fill_statfs(V9fsState *s, V9fsPDU *p= du, struct statfs *stbuf) f_bavail =3D stbuf->f_bavail/bsize_factor; f_files =3D stbuf->f_files; f_ffree =3D stbuf->f_ffree; +#ifdef CONFIG_DARWIN + fsid_val =3D (unsigned int)stbuf->f_fsid.val[0] | + (unsigned long long)stbuf->f_fsid.val[1] << 32; + f_namelen =3D MAXNAMLEN; +#else fsid_val =3D (unsigned int) stbuf->f_fsid.__val[0] | (unsigned long long)stbuf->f_fsid.__val[1] << 32; f_namelen =3D stbuf->f_namelen; +#endif =20 return pdu_marshal(pdu, offset, "ddqqqqqqd", f_type, f_bsize, f_blocks, f_bfree, --=20 2.8.1