From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38610) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yrp9r-0004wB-MC for qemu-devel@nongnu.org; Mon, 11 May 2015 10:58:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yrp9l-0001RM-Td for qemu-devel@nongnu.org; Mon, 11 May 2015 10:58:15 -0400 Message-ID: <5550C376.8000201@redhat.com> Date: Mon, 11 May 2015 16:57:58 +0200 From: Max Reitz MIME-Version: 1.0 References: <1431105726-3682-1-git-send-email-kwolf@redhat.com> <1431105726-3682-7-git-send-email-kwolf@redhat.com> In-Reply-To: <1431105726-3682-7-git-send-email-kwolf@redhat.com> Content-Type: text/plain; charset=iso-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 06/34] block: Use QemuOpts in bdrv_open_common() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf , qemu-block@nongnu.org Cc: armbru@redhat.com, qemu-devel@nongnu.org On 08.05.2015 19:21, Kevin Wolf wrote: > Instead of manually parsing options and then deleting them from the > options QDict, just use QemuOpts like most other places that deal with > block device options. > > More options will be added there and then QemuOpts is a lot more > managable than open-coding everything. > > Signed-off-by: Kevin Wolf > --- > block.c | 37 ++++++++++++++++++++++++++++++++----- > 1 file changed, 32 insertions(+), 5 deletions(-) > > diff --git a/block.c b/block.c > index 7904098..cea022f 100644 > --- a/block.c > +++ b/block.c > @@ -757,6 +757,19 @@ static void bdrv_assign_node_name(BlockDriverState *bs, > QTAILQ_INSERT_TAIL(&graph_bdrv_states, bs, node_list); > } > > +static QemuOptsList bdrv_runtime_opts = { > + .name = "bdrv_common", > + .head = QTAILQ_HEAD_INITIALIZER(bdrv_runtime_opts.head), > + .desc = { > + { > + .name = "node-name", > + .type = QEMU_OPT_STRING, > + .help = "Node name of the block device node", > + }, > + { /* end of list */ } > + }, > +}; > + > /* > * Common part for opening disk images and files > * > @@ -768,6 +781,7 @@ static int bdrv_open_common(BlockDriverState *bs, BlockDriverState *file, > int ret, open_flags; > const char *filename; > const char *node_name = NULL; > + QemuOpts *opts; > Error *local_err = NULL; > > assert(drv != NULL); > @@ -788,19 +802,28 @@ static int bdrv_open_common(BlockDriverState *bs, BlockDriverState *file, > > trace_bdrv_open_common(bs, filename ?: "", flags, drv->format_name); > > - node_name = qdict_get_try_str(options, "node-name"); > + opts = qemu_opts_create(&bdrv_runtime_opts, NULL, 0, &error_abort); > + qemu_opts_absorb_qdict(opts, options, &local_err); > + if (local_err) { > + error_propagate(errp, local_err); > + ret = -EINVAL; > + goto fail_opts; > + } > + > + node_name = qemu_opt_get(opts, "node-name"); > bdrv_assign_node_name(bs, node_name, &local_err); > if (local_err) { > error_propagate(errp, local_err); > - return -EINVAL; > + ret = -EINVAL; > + goto fail_opts; > } > - qdict_del(options, "node-name"); > > /* bdrv_open() with directly using a protocol as drv. This layer is already > * opened, so assign it to bs (while file becomes a closed BlockDriverState) > * and return immediately. */ > if (file != NULL && drv->bdrv_file_open) { > bdrv_swap(file, bs); > + qemu_opts_del(opts); > return 0; > } > > @@ -817,7 +840,8 @@ static int bdrv_open_common(BlockDriverState *bs, BlockDriverState *file, > ? "Driver '%s' can only be used for read-only devices" > : "Driver '%s' is not whitelisted", > drv->format_name); > - return -ENOTSUP; > + ret = -ENOTSUP; > + goto fail_opts; > } > > assert(bs->copy_on_read == 0); /* bdrv_new() and bdrv_close() make it so */ > @@ -826,7 +850,8 @@ static int bdrv_open_common(BlockDriverState *bs, BlockDriverState *file, > bdrv_enable_copy_on_read(bs); > } else { > error_setg(errp, "Can't use copy-on-read on read-only device"); > - return -EINVAL; > + ret = -EINVAL; > + goto fail_opts; > } > } > > @@ -898,6 +923,8 @@ free_and_fail: "opts" seems to be leaked in case of success. Max > g_free(bs->opaque); > bs->opaque = NULL; > bs->drv = NULL; > +fail_opts: > + qemu_opts_del(opts); > return ret; > } >