commit 1184b411016bce7590723170aa6b5984518707ec
author Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Tue Feb 02 15:49:56 2021 +0300
committer Eric Blake <eblake@redhat.com> Mon Mar 08 16:04:46 2021 -0600
tree 2660819bdf1156bbf47b3794fcf6ee91b40f3f9b
parent 15ce94a68ca6730466c565c3d29971aab3087bf1

block/qcow2: refactor qcow2_update_options_prepare error paths

Keep setting ret close to setting errp and don't merge different error
paths into one. This way it's more obvious that we don't return
error without setting errp.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Message-Id: <20210202124956.63146-15-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>

block/qcow2.c

diff --git a/block/qcow2.c b/block/qcow2.c
index a1dee95..0db1227 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1158,6 +1158,10 @@
         }
         qdict_put_str(encryptopts, "format", "qcow");
         r->crypto_opts = block_crypto_open_opts_init(encryptopts, errp);
+        if (!r->crypto_opts) {
+            ret = -EINVAL;
+            goto fail;
+        }
         break;
 
     case QCOW_CRYPT_LUKS:
@@ -1170,14 +1174,15 @@
         }
         qdict_put_str(encryptopts, "format", "luks");
         r->crypto_opts = block_crypto_open_opts_init(encryptopts, errp);
+        if (!r->crypto_opts) {
+            ret = -EINVAL;
+            goto fail;
+        }
         break;
 
     default:
         error_setg(errp, "Unsupported encryption method %d",
                    s->crypt_method_header);
-        break;
-    }
-    if (s->crypt_method_header != QCOW_CRYPT_NONE && !r->crypto_opts) {
         ret = -EINVAL;
         goto fail;
     }