From ed9114356b587b362f5ed10e75366a4f07ed32af Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Mon, 29 Sep 2014 17:12:59 +0200 Subject: raw-posix: Fix build without posix_fallocate() Check for the presence of posix_fallocate() in configure and only compile in support for PREALLOC_MODE_FALLOC when it's there. Signed-off-by: Kevin Wolf Signed-off-by: Peter Maydell --- block/raw-posix.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'block/raw-posix.c') diff --git a/block/raw-posix.c b/block/raw-posix.c index a253697427..86ce4f2607 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -1416,16 +1416,21 @@ static int raw_create(const char *filename, QemuOpts *opts, Error **errp) goto out_close; } - if (prealloc == PREALLOC_MODE_FALLOC) { + switch (prealloc) { +#ifdef CONFIG_POSIX_FALLOCATE + case PREALLOC_MODE_FALLOC: /* posix_fallocate() doesn't set errno. */ result = -posix_fallocate(fd, 0, total_size); if (result != 0) { error_setg_errno(errp, -result, "Could not preallocate data for the new file"); } - } else if (prealloc == PREALLOC_MODE_FULL) { - buf = g_malloc0(65536); + break; +#endif + case PREALLOC_MODE_FULL: + { int64_t num = 0, left = total_size; + buf = g_malloc0(65536); while (left > 0) { num = MIN(left, 65536); @@ -1440,10 +1445,15 @@ static int raw_create(const char *filename, QemuOpts *opts, Error **errp) } fsync(fd); g_free(buf); - } else if (prealloc != PREALLOC_MODE_OFF) { + break; + } + case PREALLOC_MODE_OFF: + break; + default: result = -EINVAL; error_setg(errp, "Unsupported preallocation mode: %s", PreallocMode_lookup[prealloc]); + break; } out_close: -- cgit v1.2.1