From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46681) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clRkX-0005pM-Di for qemu-devel@nongnu.org; Tue, 07 Mar 2017 21:54:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1clRkW-0005y7-Is for qemu-devel@nongnu.org; Tue, 07 Mar 2017 21:54:49 -0500 From: Eric Blake Date: Tue, 7 Mar 2017 20:54:26 -0600 Message-Id: <20170308025428.1037-9-eblake@redhat.com> In-Reply-To: <20170308025428.1037-1-eblake@redhat.com> References: <20170308025428.1037-1-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v6 08/10] blkdebug: Simplify override logic List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, qemu-block@nongnu.org, mreitz@redhat.com Rather than store into a local variable, then copy to the struct if the value is valid, then reporting errors otherwise, it is simpler to just store into the struct and report errors if the value is invalid. This however requires that the struct store a 64-bit number, rather than a narrower type. Move the errno assignment into a label that will be reused from more places in the next patch. Signed-off-by: Eric Blake Reviewed-by: Max Reitz Reviewed-by: Kevin Wolf --- v6: tweak error message, but R-b kept v5: no change v4: fix typo in commit message, move errno assignment v3: new patch --- block/blkdebug.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/block/blkdebug.c b/block/blkdebug.c index b3aa5c3..dd5d85d 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -38,7 +38,7 @@ typedef struct BDRVBlkdebugState { int state; int new_state; - int align; + uint64_t align; /* For blkdebug_refresh_filename() */ char *config_file; @@ -353,7 +353,6 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, BDRVBlkdebugState *s = bs->opaque; QemuOpts *opts; Error *local_err = NULL; - uint64_t align; int ret; opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort); @@ -389,12 +388,10 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, bs->file->bs->supported_zero_flags; /* Set request alignment */ - align = qemu_opt_get_size(opts, "align", 0); - if (align < INT_MAX && is_power_of_2(align)) { - s->align = align; - } else if (align) { - error_setg(errp, "Invalid alignment"); - ret = -EINVAL; + s->align = qemu_opt_get_size(opts, "align", 0); + if (s->align && (s->align >= INT_MAX || !is_power_of_2(s->align))) { + error_setg(errp, "Cannot meet constraints with align %" PRIu64, + s->align); goto fail_unref; } @@ -402,6 +399,7 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, goto out; fail_unref: + ret = -EINVAL; bdrv_unref_child(bs, bs->file); out: if (ret < 0) { -- 2.9.3