From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vq3Ue-0007g9-E4 for qemu-devel@nongnu.org; Mon, 09 Dec 2013 11:15:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vq3UZ-000211-4a for qemu-devel@nongnu.org; Mon, 09 Dec 2013 11:15:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39813) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vq3UY-00020q-T9 for qemu-devel@nongnu.org; Mon, 09 Dec 2013 11:15:31 -0500 Date: Mon, 9 Dec 2013 17:15:26 +0100 From: Kevin Wolf Message-ID: <20131209161526.GI3549@dhcp-200-207.str.redhat.com> References: <1386263703-19292-1-git-send-email-benoit@irqsave.net> <1386263703-19292-3-git-send-email-benoit@irqsave.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1386263703-19292-3-git-send-email-benoit@irqsave.net> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH V4 2/7] block: Allow the user to define "node-name" option. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?iso-8859-1?Q?Beno=EEt?= Canet Cc: famz@redhat.com, jcody@redhat.com, qemu-devel@nongnu.org, armbru@redhat.com, stefanha@redhat.com Am 05.12.2013 um 18:14 hat Beno=EEt Canet geschrieben: > Signed-off-by: Benoit Canet > --- > block.c | 44 +++++++++++++++++++++++++++++++++++++++----- > 1 file changed, 39 insertions(+), 5 deletions(-) >=20 > diff --git a/block.c b/block.c > index 4f6b36a..61f5ba0 100644 > --- a/block.c > +++ b/block.c > @@ -873,6 +873,7 @@ int bdrv_file_open(BlockDriverState **pbs, const ch= ar *filename, > const char *drvname; > bool allow_protocol_prefix =3D false; > Error *local_err =3D NULL; > + const char *node_name =3D NULL; > int ret; > =20 > /* NULL means an empty set of options */ > @@ -880,7 +881,15 @@ int bdrv_file_open(BlockDriverState **pbs, const c= har *filename, > options =3D qdict_new(); > } > =20 > - bs =3D bdrv_new("", ""); > + node_name =3D qdict_get_try_str(options, "node-name"); > + if (node_name && bdrv_find_node(node_name)) { > + error_setg(errp, "Duplicate node name"); > + QDECREF(options); > + return -EINVAL; > + } > + bs =3D bdrv_new("", node_name ? node_name : ""); > + qdict_del(options, "node-name"); > + > bs->options =3D options; > options =3D qdict_clone_shallow(options); > =20 > @@ -980,6 +989,7 @@ int bdrv_open_backing_file(BlockDriverState *bs, QD= ict *options, Error **errp) > int back_flags, ret; > BlockDriver *back_drv =3D NULL; > Error *local_err =3D NULL; > + const char *node_name =3D NULL; > =20 > if (bs->backing_hd !=3D NULL) { > QDECREF(options); > @@ -1002,7 +1012,14 @@ int bdrv_open_backing_file(BlockDriverState *bs,= QDict *options, Error **errp) > sizeof(backing_filename)); > } > =20 > - bs->backing_hd =3D bdrv_new("", ""); > + node_name =3D qdict_get_try_str(options, "node-name"); > + if (node_name && bdrv_find_node(node_name)) { > + error_setg(errp, "Duplicate node name"); > + QDECREF(options); > + return -EINVAL; > + } > + bs->backing_hd =3D bdrv_new("", node_name ? node_name : ""); > + qdict_del(options, "node-name"); > =20 > if (bs->backing_format[0] !=3D '\0') { > back_drv =3D bdrv_find_format(bs->backing_format); > @@ -1046,6 +1063,7 @@ int bdrv_open(BlockDriverState *bs, const char *f= ilename, QDict *options, > BlockDriverState *file =3D NULL; > QDict *file_options =3D NULL; > const char *drvname; > + const char *node_name =3D NULL; > Error *local_err =3D NULL; > =20 > /* NULL means an empty set of options */ > @@ -1053,6 +1071,22 @@ int bdrv_open(BlockDriverState *bs, const char *= filename, QDict *options, > options =3D qdict_new(); > } > =20 > + node_name =3D qdict_get_try_str(options, "node-name"); > + if (node_name && bdrv_find_node(node_name)) { > + error_setg(errp, "Duplicate node name"); > + QDECREF(options); > + return -EINVAL; > + } > + > + if (node_name) { > + pstrcpy(bs->node_name, sizeof(bs->node_name), node_name); > + if (node_name[0] !=3D '\0') { > + QTAILQ_INSERT_TAIL(&graph_bdrv_states, bs, node_list); > + } > + } > + > + qdict_del(options, "node-name"); We duplicate some code all over the place. In general you seem to be trying to let the caller of bdrv_new() already figure out what the node name is by parsing the options QDict; here however, you do it after bdrv_new(). Can't we consolidate this and only ever set the node name in bdrv_open_common(), so that the option is parsed only once, there is only once place adding BDSes to the list, and there is only one place checking for duplicates? Kevin