From patchwork Wed Dec 14 01:45:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Evans X-Patchwork-Id: 131286 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4B5921007D4 for ; Wed, 14 Dec 2011 12:45:00 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755771Ab1LNBo6 (ORCPT ); Tue, 13 Dec 2011 20:44:58 -0500 Received: from ozlabs.org ([203.10.76.45]:54800 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753655Ab1LNBo6 (ORCPT ); Tue, 13 Dec 2011 20:44:58 -0500 Received: from [10.61.2.183] (ibmaus65.lnk.telstra.net [165.228.126.9]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPSA id 6383B1007D3; Wed, 14 Dec 2011 12:44:55 +1100 (EST) Message-ID: <4EE7FFD0.10809@ozlabs.org> Date: Wed, 14 Dec 2011 12:45:52 +1100 From: Matt Evans User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.23) Gecko/20110921 Thunderbird/3.1.15 MIME-Version: 1.0 To: David Evensky CC: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, penberg@kernel.org Subject: Re: [PATCH V3 1/2] kvm tools: Add ability to map guest RAM from hugetlbfs References: <1323757307-10411-1-git-send-email-matt@ozlabs.org> <1323757307-10411-2-git-send-email-matt@ozlabs.org> <20111214000316.GE7984@dancer.ca.sandia.gov> In-Reply-To: <20111214000316.GE7984@dancer.ca.sandia.gov> Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org 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 Hi David, Argh! I didn't catch this as it compiles fine on my x86_64 box (with 64bit toolchain) >:( So, struct statfs's f_type and f_blocks are __SWORD_TYPE which is either an int or a long (if on 64bit).... so identical to if it were simply a long, nice. Pekka, a re-jiggle fix attached. Thanks, Matt --- From: Matt Evans Date: Wed, 14 Dec 2011 12:10:03 +1100 Subject: [PATCH] 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. Fixes the build. Signed-off-by: Matt Evans --- tools/kvm/util/util.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/kvm/util/util.c b/tools/kvm/util/util.c index ad5418e..00f7315 100644 --- 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);