summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2017-06-13 22:20:56 +0200
committerMax Reitz <mreitz@redhat.com>2017-07-11 17:45:01 +0200
commit7dacd8bd3d1f7eeb1850d5ad8e1898e6d314889f (patch)
treee745324275fd2df98d59572b6ce628dfdf622517
parentdc5f690b97ccdffa79fe7169bb26b0ebf06688bf (diff)
downloadfocaccia-qemu-7dacd8bd3d1f7eeb1850d5ad8e1898e6d314889f.tar.gz
focaccia-qemu-7dacd8bd3d1f7eeb1850d5ad8e1898e6d314889f.zip
block/file-posix: Small fixes in raw_create()
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 <mreitz@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20170613202107.10125-6-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
-rw-r--r--block/file-posix.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/block/file-posix.c b/block/file-posix.c
index 4a40976d4c..3388def9b1 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -1910,6 +1910,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
@@ -1921,7 +1923,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) {
@@ -1953,7 +1954,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;