mirror of
https://github.com/clearlinux/kvmtool.git
synced 2026-09-06 05:31:50 +00:00
Matt Evans
78682c285b
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>
117 lines
2.2 KiB
C
117 lines
2.2 KiB
C
/*
|
|
* Taken from perf which in turn take it from GIT
|
|
*/
|
|
|
|
#include "kvm/util.h"
|
|
|
|
#include <linux/magic.h> /* For HUGETLBFS_MAGIC */
|
|
#include <sys/mman.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/statfs.h>
|
|
|
|
static void report(const char *prefix, const char *err, va_list params)
|
|
{
|
|
char msg[1024];
|
|
vsnprintf(msg, sizeof(msg), err, params);
|
|
fprintf(stderr, " %s%s\n", prefix, msg);
|
|
}
|
|
|
|
static NORETURN void die_builtin(const char *err, va_list params)
|
|
{
|
|
report(" Fatal: ", err, params);
|
|
exit(128);
|
|
}
|
|
|
|
static void error_builtin(const char *err, va_list params)
|
|
{
|
|
report(" Error: ", err, params);
|
|
}
|
|
|
|
static void warn_builtin(const char *warn, va_list params)
|
|
{
|
|
report(" Warning: ", warn, params);
|
|
}
|
|
|
|
static void info_builtin(const char *info, va_list params)
|
|
{
|
|
report(" Info: ", info, params);
|
|
}
|
|
|
|
void die(const char *err, ...)
|
|
{
|
|
va_list params;
|
|
|
|
va_start(params, err);
|
|
die_builtin(err, params);
|
|
va_end(params);
|
|
}
|
|
|
|
int pr_error(const char *err, ...)
|
|
{
|
|
va_list params;
|
|
|
|
va_start(params, err);
|
|
error_builtin(err, params);
|
|
va_end(params);
|
|
return -1;
|
|
}
|
|
|
|
void pr_warning(const char *warn, ...)
|
|
{
|
|
va_list params;
|
|
|
|
va_start(params, warn);
|
|
warn_builtin(warn, params);
|
|
va_end(params);
|
|
}
|
|
|
|
void pr_info(const char *info, ...)
|
|
{
|
|
va_list params;
|
|
|
|
va_start(params, info);
|
|
info_builtin(info, params);
|
|
va_end(params);
|
|
}
|
|
|
|
void die_perror(const char *s)
|
|
{
|
|
perror(s);
|
|
exit(1);
|
|
}
|
|
|
|
void *mmap_hugetlbfs(const char *htlbfs_path, u64 size)
|
|
{
|
|
char mpath[PATH_MAX];
|
|
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 ((unsigned int)sfs.f_type != HUGETLBFS_MAGIC) {
|
|
die("%s is not hugetlbfs!\n", htlbfs_path);
|
|
}
|
|
|
|
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",
|
|
blk_size, size);
|
|
}
|
|
|
|
snprintf(mpath, PATH_MAX, "%s/kvmtoolXXXXXX", htlbfs_path);
|
|
fd = mkstemp(mpath);
|
|
if (fd < 0)
|
|
die("Can't open %s for hugetlbfs map\n", mpath);
|
|
unlink(mpath);
|
|
if (ftruncate(fd, size) < 0)
|
|
die("Can't ftruncate for mem mapping size %lld\n",
|
|
size);
|
|
addr = mmap(NULL, size, PROT_RW, MAP_PRIVATE, fd, 0);
|
|
close(fd);
|
|
|
|
return addr;
|
|
}
|