Patchwork virtio-9p-proxy: Fix typo causing compile failure on 32 bit hosts

login
register
mail settings
Submitter Peter Maydell
Date Jan. 6, 2012, 6:47 p.m.
Message ID <1325875641-27938-1-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/134688/
State New
Headers show

Comments

Peter Maydell - Jan. 6, 2012, 6:47 p.m.
Fix a compile failure on 32 bit hosts (integer constant is too large
for 'unsigned long' type) by correcting a typo where the mask used
for filling in the second f_fsid word had too many 'F's in it.
Also drop the 'L' suffix that allowed this typo to go undetected on
64 bit hosts.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
This was introduced in commit b178adc3e.

 hw/9pfs/virtio-9p-proxy.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Anthony Liguori - Jan. 6, 2012, 7:11 p.m.
On 01/06/2012 12:47 PM, Peter Maydell wrote:
> Fix a compile failure on 32 bit hosts (integer constant is too large
> for 'unsigned long' type) by correcting a typo where the mask used
> for filling in the second f_fsid word had too many 'F's in it.
> Also drop the 'L' suffix that allowed this typo to go undetected on
> 64 bit hosts.
>
> Signed-off-by: Peter Maydell<peter.maydell@linaro.org>

Applied.  Thanks.

Regards,

Anthony Liguori

> ---
> This was introduced in commit b178adc3e.
>
>   hw/9pfs/virtio-9p-proxy.c |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/9pfs/virtio-9p-proxy.c b/hw/9pfs/virtio-9p-proxy.c
> index 44f5fc4..d5ad208 100644
> --- a/hw/9pfs/virtio-9p-proxy.c
> +++ b/hw/9pfs/virtio-9p-proxy.c
> @@ -112,8 +112,8 @@ static void prstatfs_to_statfs(struct statfs *stfs, ProxyStatFS *prstfs)
>       stfs->f_bavail = prstfs->f_bavail;
>       stfs->f_files = prstfs->f_files;
>       stfs->f_ffree = prstfs->f_ffree;
> -    stfs->f_fsid.__val[0] = prstfs->f_fsid[0]&  0xFFFFFFFFUL;
> -    stfs->f_fsid.__val[1] = prstfs->f_fsid[1]>>  32&  0xFFFFFFFFFUL;
> +    stfs->f_fsid.__val[0] = prstfs->f_fsid[0]&  0xFFFFFFFFU;
> +    stfs->f_fsid.__val[1] = prstfs->f_fsid[1]>>  32&  0xFFFFFFFFU;
>       stfs->f_namelen = prstfs->f_namelen;
>       stfs->f_frsize = prstfs->f_frsize;
>   }

Patch

diff --git a/hw/9pfs/virtio-9p-proxy.c b/hw/9pfs/virtio-9p-proxy.c
index 44f5fc4..d5ad208 100644
--- a/hw/9pfs/virtio-9p-proxy.c
+++ b/hw/9pfs/virtio-9p-proxy.c
@@ -112,8 +112,8 @@  static void prstatfs_to_statfs(struct statfs *stfs, ProxyStatFS *prstfs)
     stfs->f_bavail = prstfs->f_bavail;
     stfs->f_files = prstfs->f_files;
     stfs->f_ffree = prstfs->f_ffree;
-    stfs->f_fsid.__val[0] = prstfs->f_fsid[0] & 0xFFFFFFFFUL;
-    stfs->f_fsid.__val[1] = prstfs->f_fsid[1] >> 32 & 0xFFFFFFFFFUL;
+    stfs->f_fsid.__val[0] = prstfs->f_fsid[0] & 0xFFFFFFFFU;
+    stfs->f_fsid.__val[1] = prstfs->f_fsid[1] >> 32 & 0xFFFFFFFFU;
     stfs->f_namelen = prstfs->f_namelen;
     stfs->f_frsize = prstfs->f_frsize;
 }