[v2,for-2.10,05/16] block/file-posix: Small fixes in raw_create()
diff mbox

Message ID 20170403160936.28293-6-mreitz@redhat.com
State New
Headers show

Commit Message

Max Reitz April 3, 2017, 4:09 p.m. UTC
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>
---
 block/file-posix.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Philippe Mathieu-Daudé April 3, 2017, 7:01 p.m. UTC | #1
On 04/03/2017 01:09 PM, Max Reitz wrote:
> 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>

> ---
>  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 3e9c416668..cab77db963 100644
> --- a/block/file-posix.c
> +++ b/block/file-posix.c
> @@ -1693,6 +1693,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
> @@ -1704,7 +1706,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) {
> @@ -1736,7 +1737,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;
>

Patch
diff mbox

diff --git a/block/file-posix.c b/block/file-posix.c
index 3e9c416668..cab77db963 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -1693,6 +1693,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
@@ -1704,7 +1706,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) {
@@ -1736,7 +1737,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;