From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: Alistair.Francis@wdc.com, bin.meng@windriver.com,
palmer@dabbelt.com, marcandre.lureau@redhat.com,
pbonzini@redhat.com, yuval.shaia.ml@gmail.com,
marcel.apfelbaum@gmail.com, mst@redhat.com, quintela@redhat.com,
dgilbert@redhat.com, pavel.dovgaluk@ispras.ru,
alex.bennee@linaro.org, peterx@redhat.com, david@redhat.com,
philmd@linaro.org, mrolnik@gmail.com, gaosong@loongson.cn,
yangxiaojuan@loongson.cn, aurelien@aurel32.net,
jiaxun.yang@flygoat.com, aleksandar.rikalo@syrmia.com,
berrange@redhat.com, thuth@redhat.com, lvivier@redhat.com,
suhang16@mails.ucas.ac.cn, chen.zhang@intel.com,
lizhijian@fujitsu.com, stefanha@redhat.com,
qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, virtio-fs@redhat.com,
Fam Zheng <fam@euphon.net>, Kevin Wolf <kwolf@redhat.com>,
Hanna Reitz <hreitz@redhat.com>,
qemu-block@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Subject: [Virtio-fs] [PATCH v3 2/3] block/vmdk: Simplify vmdk_co_create() to return directly
Date: Mon, 28 Nov 2022 10:41:37 +0100 [thread overview]
Message-ID: <20221128094138.2824623-3-armbru@redhat.com> (raw)
In-Reply-To: <20221128094138.2824623-1-armbru@redhat.com>
Cc: Fam Zheng <fam@euphon.net>
Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Hanna Reitz <hreitz@redhat.com>
Cc: qemu-block@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
block/vmdk.c | 28 +++++++++++-----------------
1 file changed, 11 insertions(+), 17 deletions(-)
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)
--
2.37.3
next prev parent reply other threads:[~2022-11-28 9:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-28 9:41 [Virtio-fs] [PATCH v3 0/3] cleanup: Tweak and re-run return_directly.cocci Markus Armbruster
2022-11-28 9:41 ` [Virtio-fs] [PATCH v3 1/3] " Markus Armbruster
2022-11-28 9:41 ` Markus Armbruster [this message]
2022-11-28 15:58 ` [Virtio-fs] [PATCH v3 2/3] block/vmdk: Simplify vmdk_co_create() to return directly Juan Quintela
2022-11-28 9:41 ` [Virtio-fs] [PATCH v3 3/3] ppc4xx_sdram: Simplify sdram_ddr_size() " Markus Armbruster
2022-11-28 15:59 ` Juan Quintela
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=20221128094138.2824623-3-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=Alistair.Francis@wdc.com \
--cc=aleksandar.rikalo@syrmia.com \
--cc=alex.bennee@linaro.org \
--cc=aurelien@aurel32.net \
--cc=berrange@redhat.com \
--cc=bin.meng@windriver.com \
--cc=chen.zhang@intel.com \
--cc=david@redhat.com \
--cc=dgilbert@redhat.com \
--cc=fam@euphon.net \
--cc=gaosong@loongson.cn \
--cc=hreitz@redhat.com \
--cc=jiaxun.yang@flygoat.com \
--cc=kwolf@redhat.com \
--cc=lizhijian@fujitsu.com \
--cc=lvivier@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mrolnik@gmail.com \
--cc=mst@redhat.com \
--cc=palmer@dabbelt.com \
--cc=pavel.dovgaluk@ispras.ru \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=quintela@redhat.com \
--cc=stefanha@redhat.com \
--cc=suhang16@mails.ucas.ac.cn \
--cc=thuth@redhat.com \
--cc=virtio-fs@redhat.com \
--cc=yangxiaojuan@loongson.cn \
--cc=yuval.shaia.ml@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).