From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53506) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7cdb-00023H-OA for qemu-devel@nongnu.org; Sun, 26 Jan 2014 22:13:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W7cdW-0000Fj-Nk for qemu-devel@nongnu.org; Sun, 26 Jan 2014 22:13:27 -0500 Received: from paradis.irqsave.net ([62.212.105.220]:48419) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7cdW-0000Ff-B5 for qemu-devel@nongnu.org; Sun, 26 Jan 2014 22:13:22 -0500 Date: Mon, 27 Jan 2014 04:13:23 +0100 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140127031323.GG7415@irqsave.net> References: <1390762963-25538-1-git-send-email-mreitz@redhat.com> <1390762963-25538-9-git-send-email-mreitz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1390762963-25538-9-git-send-email-mreitz@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 08/10] block: Reuse bs->options setting from bdrv_open() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Reitz Cc: Kevin Wolf , qemu-devel@nongnu.org, Stefan Hajnoczi Le Sunday 26 Jan 2014 =E0 20:02:41 (+0100), Max Reitz a =E9crit : > Setting bs->options in bdrv_file_open() is not necessary if it is > already done in bdrv_open(). >=20 > Signed-off-by: Max Reitz > --- > block.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) >=20 > diff --git a/block.c b/block.c > index 0f2cd3f..f847c4b 100644 > --- a/block.c > +++ b/block.c > @@ -956,9 +956,6 @@ static int bdrv_file_open(BlockDriverState *bs, con= st char *filename, > Error *local_err =3D NULL; > int ret; > =20 > - bs->options =3D options; > - options =3D qdict_clone_shallow(options); > - > /* Fetch the file name from the options QDict if necessary */ > if (!filename) { > filename =3D qdict_get_try_str(options, "filename"); > @@ -1234,6 +1231,9 @@ int bdrv_open(BlockDriverState **pbs, const char = *filename, > bs =3D bdrv_new(""); > } > =20 > + bs->options =3D options; > + options =3D qdict_clone_shallow(options); > + > if (flags & BDRV_O_PROTOCOL) { > assert(!drv); > ret =3D bdrv_file_open(bs, filename, options, flags & ~BDRV_O_= PROTOCOL, > @@ -1250,9 +1250,6 @@ int bdrv_open(BlockDriverState **pbs, const char = *filename, > return 0; > } > =20 > - bs->options =3D options; > - options =3D qdict_clone_shallow(options); > - > /* For snapshot=3Don, create a temporary qcow2 overlay */ > if (flags & BDRV_O_SNAPSHOT) { > BlockDriverState *bs1 =3D NULL; > --=20 > 1.8.5.3 >=20 >=20 Reviewed-by: Benoit Canet