From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WG93R-0003sQ-Ct for qemu-devel@nongnu.org; Wed, 19 Feb 2014 10:27:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WG93L-000803-2n for qemu-devel@nongnu.org; Wed, 19 Feb 2014 10:27:21 -0500 Received: from lnantes-156-75-100-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:50331 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WG93K-0007zn-PO for qemu-devel@nongnu.org; Wed, 19 Feb 2014 10:27:15 -0500 Date: Wed, 19 Feb 2014 16:27:14 +0100 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140219152714.GD20622@irqsave.net> References: <1392817351-22148-1-git-send-email-famz@redhat.com> <1392817351-22148-6-git-send-email-famz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1392817351-22148-6-git-send-email-famz@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v14 05/14] block: Add bdrv_set_backing_hd() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng Cc: kwolf@redhat.com, benoit.canet@irqsave.net, armbru@redhat.com, qemu-devel@nongnu.org, rjones@redhat.com, imain@redhat.com, stefanha@redhat.com, pbonzini@redhat.com The Wednesday 19 Feb 2014 =E0 21:42:22 (+0800), Fam Zheng wrote : > This is the common but non-trivial steps to assign or change the > backing_hd of BDS. >=20 > Signed-off-by: Fam Zheng > --- > block.c | 34 +++++++++++++++++++++++++++------- > include/block/block.h | 1 + > 2 files changed, 28 insertions(+), 7 deletions(-) >=20 > diff --git a/block.c b/block.c > index b5cb0c7..dec44d4 100644 > --- a/block.c > +++ b/block.c > @@ -1041,6 +1041,26 @@ fail: > return ret; > } > =20 > +void bdrv_set_backing_hd(BlockDriverState *bs, BlockDriverState *backi= ng_hd) > +{ > + if (bs->backing_hd) { > + bdrv_unref(bs->backing_hd); > + } > + > + bs->backing_hd =3D backing_hd; > + if (!backing_hd) { > + bs->backing_file[0] =3D '\0'; > + bs->backing_format[0] =3D '\0'; > + goto out; > + } > + pstrcpy(bs->backing_file, sizeof(bs->backing_file), backing_hd->fi= lename); > + pstrcpy(bs->backing_format, sizeof(bs->backing_format), > + backing_hd->drv ? backing_hd->drv->format_name : ""); > + bdrv_ref(bs->backing_hd); > +out: > + bdrv_refresh_limits(bs); > +} > + > /* > * Opens the backing file for a BlockDriverState if not yet open > * > @@ -1054,6 +1074,7 @@ int bdrv_open_backing_file(BlockDriverState *bs, = QDict *options, Error **errp) > char backing_filename[PATH_MAX]; > int back_flags, ret; > BlockDriver *back_drv =3D NULL; > + BlockDriverState *backing_hd; > Error *local_err =3D NULL; > =20 > if (bs->backing_hd !=3D NULL) { > @@ -1077,6 +1098,8 @@ int bdrv_open_backing_file(BlockDriverState *bs, = QDict *options, Error **errp) > sizeof(backing_filename)); > } > =20 > + backing_hd =3D bdrv_new(""); > + > if (bs->backing_format[0] !=3D '\0') { > back_drv =3D bdrv_find_format(bs->backing_format); > } > @@ -1085,23 +1108,20 @@ int bdrv_open_backing_file(BlockDriverState *bs= , QDict *options, Error **errp) > back_flags =3D bs->open_flags & ~(BDRV_O_RDWR | BDRV_O_SNAPSHOT | > BDRV_O_COPY_ON_READ); > =20 > - assert(bs->backing_hd =3D=3D NULL); > - ret =3D bdrv_open(&bs->backing_hd, > + ret =3D bdrv_open(&backing_hd, > *backing_filename ? backing_filename : NULL, NULL,= options, > back_flags, back_drv, &local_err); > if (ret < 0) { > bs->backing_hd =3D NULL; > + bdrv_unref(backing_hd); > + backing_hd =3D NULL; > bs->open_flags |=3D BDRV_O_NO_BACKING; > error_setg(errp, "Could not open backing file: %s", > error_get_pretty(local_err)); > error_free(local_err); > return ret; > } > - > - if (bs->backing_hd->file) { > - pstrcpy(bs->backing_file, sizeof(bs->backing_file), > - bs->backing_hd->file->filename); > - } > + bdrv_set_backing_hd(bs, backing_hd); > =20 > /* Recalculate the BlockLimits with the backing file */ > bdrv_refresh_limits(bs); > diff --git a/include/block/block.h b/include/block/block.h > index a46f70a..ee1582d 100644 > --- a/include/block/block.h > +++ b/include/block/block.h > @@ -208,6 +208,7 @@ int bdrv_parse_discard_flags(const char *mode, int = *flags); > int bdrv_open_image(BlockDriverState **pbs, const char *filename, > QDict *options, const char *bdref_key, int flags, > bool allow_none, Error **errp); > +void bdrv_set_backing_hd(BlockDriverState *bs, BlockDriverState *backi= ng_hd); > int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error= **errp); > int bdrv_open(BlockDriverState **pbs, const char *filename, > const char *reference, QDict *options, int flags, > --=20 > 1.8.5.4 >=20 Reviewed-by: Benoit Canet