[v3,2/3] block/vmdk: Simplify vmdk_co_create() to return directly

Commit Message

Markus Armbruster Nov. 28, 2022, 9:41 a.m. UTC

Cc: Fam Zheng <[e-mail]>
Cc: Kevin Wolf <[e-mail]>
Cc: Hanna Reitz <[e-mail]>
Cc: [e-mail]
Signed-off-by: Markus Armbruster <[e-mail]>
Reviewed-by: Peter Maydell <[e-mail]>
Reviewed-by: Philippe Mathieu-Daudé <[e-mail]>
---
 block/vmdk.c | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

Comments

Juan Quintela Nov. 28, 2022, 3:58 p.m. UTC | #1

Markus Armbruster <[e-mail]> wrote:
> Cc: Fam Zheng <[e-mail]>
> Cc: Kevin Wolf <[e-mail]>
> Cc: Hanna Reitz <[e-mail]>
> Cc: [e-mail]
> Signed-off-by: Markus Armbruster <[e-mail]>
> Reviewed-by: Peter Maydell <[e-mail]>
> Reviewed-by: Philippe Mathieu-Daudé <[e-mail]>

Reviewed-by: Juan Quintela <[e-mail]>

goto, uninitialized variable at declaraton and can use return directly.
Not bad at all.

Patch

diff --git a/block/vmdk.c b/block/vmdk.c
index 26376352b9..bac3d8db50 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -2821,7 +2821,6 @@  static BlockBackend *vmdk_co_create_cb(int64_t size, int idx,
 static int coroutine_fn vmdk_co_create(BlockdevCreateOptions *create_options,
                                        Error **errp)
 {
-    int ret;
     BlockdevCreateOptionsVmdk *opts;
 
     opts = &create_options->u.vmdk;
@@ -2829,24 +2828,19 @@  static int coroutine_fn vmdk_co_create(BlockdevCreateOptions *create_options,
     /* Validate options */
     if (!QEMU_IS_ALIGNED(opts->size, BDRV_SECTOR_SIZE)) {
         error_setg(errp, "Image size must be a multiple of 512 bytes");
-        ret = -EINVAL;
-        goto out;
+        return -EINVAL;
     }
 
-    ret = vmdk_co_do_create(opts->size,
-                            opts->subformat,
-                            opts->adapter_type,
-                            opts->backing_file,
-                            opts->hwversion,
-                            opts->toolsversion,
-                            false,
-                            opts->zeroed_grain,
-                            vmdk_co_create_cb,
-                            opts, errp);
-    return ret;
-
-out:
-    return ret;
+    return vmdk_co_do_create(opts->size,
+                             opts->subformat,
+                             opts->adapter_type,
+                             opts->backing_file,
+                             opts->hwversion,
+                             opts->toolsversion,
+                             false,
+                             opts->zeroed_grain,
+                             vmdk_co_create_cb,
+                             opts, errp);
 }
 
 static void vmdk_close(BlockDriverState *bs)