From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnXi5-0007RO-9W for qemu-devel@nongnu.org; Mon, 13 Mar 2017 17:40:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cnXi4-0001pf-6i for qemu-devel@nongnu.org; Mon, 13 Mar 2017 17:40:57 -0400 From: Max Reitz Date: Mon, 13 Mar 2017 22:40:34 +0100 Message-Id: <20170313214045.26857-3-mreitz@redhat.com> In-Reply-To: <20170313214001.26339-1-mreitz@redhat.com> References: <20170313214001.26339-1-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH for-2.10 05/16] block/file-posix: Small fixes in raw_create() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, Max Reitz , Kevin Wolf Variables should be declared at the start of a block, and if a certain parameter value is not supported it may be better to return -ENOTSUP instead of -EINVAL. Signed-off-by: Max Reitz --- block/file-posix.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index dde8c101c8..b02d8fc37b 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1670,6 +1670,8 @@ static int raw_create(const char *filename, QemuOpts *opts, Error **errp) #endif case PREALLOC_MODE_FULL: { + int64_t num = 0, left = total_size; + /* * Knowing the final size from the beginning could allow the file * system driver to do less allocations and possibly avoid @@ -1681,7 +1683,6 @@ static int raw_create(const char *filename, QemuOpts *opts, Error **errp) goto out_close; } - int64_t num = 0, left = total_size; buf = g_malloc0(65536); while (left > 0) { @@ -1713,7 +1714,7 @@ static int raw_create(const char *filename, QemuOpts *opts, Error **errp) } break; default: - result = -EINVAL; + result = -ENOTSUP; error_setg(errp, "Unsupported preallocation mode: %s", PreallocMode_lookup[prealloc]); break; -- 2.12.0