All of lore.kernel.org
 help / color / mirror / Atom feed
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, berto@igalia.com,
	pavel.dovgaluk@ispras.ru, qemu-devel@nongnu.org,
	armbru@redhat.com, Greg Kurz <groug@kaod.org>,
	stefanha@redhat.com, pbonzini@redhat.com, mreitz@redhat.com,
	jsnow@redhat.com, ari@tuxera.com
Subject: [PATCH v7 11/14] block/qcow2: read_cache_sizes: return status value
Date: Tue,  2 Feb 2021 15:49:53 +0300	[thread overview]
Message-ID: <20210202124956.63146-12-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20210202124956.63146-1-vsementsov@virtuozzo.com>

It's better to return status together with setting errp. It allows to
reduce error propagation.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Alberto Garcia <berto@igalia.com>
---
 block/qcow2.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/block/qcow2.c b/block/qcow2.c
index 20d67bd9c7..2e0e050997 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -868,7 +868,7 @@ static void qcow2_attach_aio_context(BlockDriverState *bs,
     cache_clean_timer_init(bs, new_context);
 }
 
-static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts,
+static bool read_cache_sizes(BlockDriverState *bs, QemuOpts *opts,
                              uint64_t *l2_cache_size,
                              uint64_t *l2_cache_entry_size,
                              uint64_t *refcount_cache_size, Error **errp)
@@ -906,16 +906,16 @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts,
             error_setg(errp, QCOW2_OPT_CACHE_SIZE ", " QCOW2_OPT_L2_CACHE_SIZE
                        " and " QCOW2_OPT_REFCOUNT_CACHE_SIZE " may not be set "
                        "at the same time");
-            return;
+            return false;
         } else if (l2_cache_size_set &&
                    (l2_cache_max_setting > combined_cache_size)) {
             error_setg(errp, QCOW2_OPT_L2_CACHE_SIZE " may not exceed "
                        QCOW2_OPT_CACHE_SIZE);
-            return;
+            return false;
         } else if (*refcount_cache_size > combined_cache_size) {
             error_setg(errp, QCOW2_OPT_REFCOUNT_CACHE_SIZE " may not exceed "
                        QCOW2_OPT_CACHE_SIZE);
-            return;
+            return false;
         }
 
         if (l2_cache_size_set) {
@@ -954,8 +954,10 @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts,
         error_setg(errp, "L2 cache entry size must be a power of two "
                    "between %d and the cluster size (%d)",
                    1 << MIN_CLUSTER_BITS, s->cluster_size);
-        return;
+        return false;
     }
+
+    return true;
 }
 
 typedef struct Qcow2ReopenState {
@@ -982,7 +984,6 @@ static int qcow2_update_options_prepare(BlockDriverState *bs,
     int i;
     const char *encryptfmt;
     QDict *encryptopts = NULL;
-    Error *local_err = NULL;
     int ret;
 
     qdict_extract_subqdict(options, &encryptopts, "encrypt.");
@@ -995,10 +996,8 @@ static int qcow2_update_options_prepare(BlockDriverState *bs,
     }
 
     /* get L2 table/refcount block cache size from command line options */
-    read_cache_sizes(bs, opts, &l2_cache_size, &l2_cache_entry_size,
-                     &refcount_cache_size, &local_err);
-    if (local_err) {
-        error_propagate(errp, local_err);
+    if (!read_cache_sizes(bs, opts, &l2_cache_size, &l2_cache_entry_size,
+                          &refcount_cache_size, errp)) {
         ret = -EINVAL;
         goto fail;
     }
-- 
2.29.2



  parent reply	other threads:[~2021-02-02 13:11 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-02 12:49 [PATCH v7 00/14] block: deal with errp: part I Vladimir Sementsov-Ogievskiy
2021-02-02 12:49 ` [PATCH v7 01/14] block: return status from bdrv_append and friends Vladimir Sementsov-Ogievskiy
2021-02-05 11:16   ` Alberto Garcia
2021-02-05 11:26     ` Vladimir Sementsov-Ogievskiy
2021-02-02 12:49 ` [PATCH v7 02/14] block: use return status of bdrv_append() Vladimir Sementsov-Ogievskiy
2021-02-02 12:49 ` [PATCH v7 03/14] block: check return value of bdrv_open_child and drop error propagation Vladimir Sementsov-Ogievskiy
2021-02-12 23:13   ` Eric Blake
2021-02-15  9:22     ` Kevin Wolf
2021-02-15 20:04       ` Eric Blake
2021-02-16  5:03         ` Vladimir Sementsov-Ogievskiy
2021-02-16  9:02           ` Kevin Wolf
2021-02-02 12:49 ` [PATCH v7 04/14] blockdev: fix drive_backup_prepare() missed error Vladimir Sementsov-Ogievskiy
2021-02-02 12:49 ` [PATCH v7 05/14] block: drop extra error propagation for bdrv_set_backing_hd Vladimir Sementsov-Ogievskiy
2021-02-02 12:49 ` [PATCH v7 06/14] block/mirror: drop extra error propagation in commit_active_start() Vladimir Sementsov-Ogievskiy
2021-02-02 12:49 ` [PATCH v7 07/14] blockjob: return status from block_job_set_speed() Vladimir Sementsov-Ogievskiy
2021-02-02 12:49 ` [PATCH v7 08/14] block/qcow2: qcow2_get_specific_info(): drop error propagation Vladimir Sementsov-Ogievskiy
2021-02-05 11:43   ` Alberto Garcia
2021-02-05 11:52     ` Vladimir Sementsov-Ogievskiy
2021-02-05 12:01       ` Alberto Garcia
2021-02-12 19:44       ` Eric Blake
2021-02-02 12:49 ` [PATCH v7 09/14] block/qcow2-bitmap: improve qcow2_load_dirty_bitmaps() interface Vladimir Sementsov-Ogievskiy
2021-02-02 12:49 ` [PATCH v7 10/14] block/qcow2-bitmap: return status from qcow2_store_persistent_dirty_bitmaps Vladimir Sementsov-Ogievskiy
2021-02-02 12:49 ` Vladimir Sementsov-Ogievskiy [this message]
2021-02-02 12:49 ` [PATCH v7 12/14] block/qcow2: simplify qcow2_co_invalidate_cache() Vladimir Sementsov-Ogievskiy
2021-02-02 12:49 ` [PATCH v7 13/14] block/qed: bdrv_qed_do_open: deal with errp Vladimir Sementsov-Ogievskiy
2021-02-12 22:18   ` Eric Blake
2021-02-02 12:49 ` [PATCH v7 14/14] block/qcow2: refactor qcow2_update_options_prepare error paths Vladimir Sementsov-Ogievskiy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210202124956.63146-12-vsementsov@virtuozzo.com \
    --to=vsementsov@virtuozzo.com \
    --cc=ari@tuxera.com \
    --cc=armbru@redhat.com \
    --cc=berto@igalia.com \
    --cc=groug@kaod.org \
    --cc=jsnow@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=pavel.dovgaluk@ispras.ru \
    --cc=pbonzini@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.