kvm tools: Fix build of util.c on 32bit machines

commit 378ee7e6dd301347c6bf2c740cb1fb40174bcb8b broke the -Werror build
on 32bit targets due to some variable typing in struct statfs:

On 14/12/11 11:03, David Evensky wrote:
> On an x86 32bit system (and using the 32bit CodeSourcery toolchain on
> a x86_64 system) I get:
>
> evensky@machine:~/.../linux-kvm/tools/kvm$ make
>   CC       util/util.o
> util/util.c: In function 'mmap_hugetlbfs':
> util/util.c:93:17: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare]
> util/util.c:99:7: error: format '%ld' expects argument of type 'long int', but argument 2 has type 'int' [-Werror=format]
> cc1: all warnings being treated as errors
>
> make: *** [util/util.o] Error 1

Fixes the build.

Reported-by: David Evensky <evensky@dancer.ca.sandia.gov>
Signed-off-by: Matt Evans <matt@ozlabs.org>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/tools/kvm/util/util.c b/tools/kvm/util/util.c
index ad5418e0387f6de4ef86f1209d3016cd5899e81f..00f73155a55d9a4a0623068624c06a2c5c3a1f41 100644 (file)
--- a/tools/kvm/util/util.c
+++ b/tools/kvm/util/util.c
@@ -86,17 +86,19 @@ void *mmap_hugetlbfs(const char *htlbfs_path, u64 size)
        int fd;
        struct statfs sfs;
        void *addr;
+       unsigned long blk_size;
 
        if (statfs(htlbfs_path, &sfs) < 0)
                die("Can't stat %s\n", htlbfs_path);
 
-       if (sfs.f_type != HUGETLBFS_MAGIC) {
+       if ((unsigned int)sfs.f_type != HUGETLBFS_MAGIC) {
                die("%s is not hugetlbfs!\n", htlbfs_path);
        }
 
-       if (sfs.f_bsize == 0 || (unsigned long)sfs.f_bsize > size) {
+       blk_size = (unsigned long)sfs.f_bsize;
+       if (sfs.f_bsize == 0 || blk_size > size) {
                die("Can't use hugetlbfs pagesize %ld for mem size %lld\n",
-                   sfs.f_bsize, size);
+                   blk_size, size);
        }
 
        snprintf(mpath, PATH_MAX, "%s/kvmtoolXXXXXX", htlbfs_path);