From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34924) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBu9y-0002i3-FU for qemu-devel@nongnu.org; Wed, 23 Dec 2015 19:53:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aBu9x-0001tf-Cu for qemu-devel@nongnu.org; Wed, 23 Dec 2015 19:53:38 -0500 References: <1450850347-5291-1-git-send-email-famz@redhat.com> <1450850347-5291-5-git-send-email-famz@redhat.com> From: Max Reitz Message-ID: <567B4207.8030300@redhat.com> Date: Thu, 24 Dec 2015 01:53:27 +0100 MIME-Version: 1.0 In-Reply-To: <1450850347-5291-5-git-send-email-famz@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="WOQqkTfxfblEFBHn0tIaedXLS0oWQNGv8" Subject: Re: [Qemu-devel] [PATCH v3 4/5] qmp: Add blockdev-mirror command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng , qemu-devel@nongnu.org Cc: Kevin Wolf , qemu-block@nongnu.org, Jeff Cody , Markus Armbruster , Stefan Hajnoczi , pbonzini@redhat.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --WOQqkTfxfblEFBHn0tIaedXLS0oWQNGv8 Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: quoted-printable On 23.12.2015 06:59, Fam Zheng wrote: > This will start a mirror job from a named device to another named > device, its relation with drive-mirror is similar with blockdev-backup > to drive-backup. >=20 > In blockdev-mirror, the target node should be prepared by blockdev-add,= > which will be responsible for assigning a name to the new node, so > we don't have 'node-name' parameter. >=20 > Signed-off-by: Fam Zheng > --- > blockdev.c | 62 ++++++++++++++++++++++++++++++++++++++++++++= ++++++++ > qapi/block-core.json | 47 +++++++++++++++++++++++++++++++++++++++ > qmp-commands.hx | 48 ++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 157 insertions(+) It appears you haven't addressed the comments for v2. I only had a single one (regarding documentation), but Markus had a couple ones, so those may be worth addressing. >=20 > diff --git a/blockdev.c b/blockdev.c > index f42e171..2df0c6d 100644 > --- a/blockdev.c > +++ b/blockdev.c > @@ -3345,6 +3345,10 @@ static void blockdev_mirror_common(BlockDriverSt= ate *bs, > if (bdrv_op_is_blocked(target, BLOCK_OP_TYPE_MIRROR_TARGET, errp))= { > return; > } > + if (target->blk) { > + error_setg(errp, "Cannot mirror to an attached block device");= > + return; > + } > =20 > if (!bs->backing && sync =3D=3D MIRROR_SYNC_MODE_TOP) { > sync =3D MIRROR_SYNC_MODE_FULL; > @@ -3518,6 +3522,64 @@ out: > aio_context_release(aio_context); > } > =20 > +void qmp_blockdev_mirror(const char *device, const char *target, > + bool has_replaces, const char *replaces, > + MirrorSyncMode sync, > + bool has_speed, int64_t speed, > + bool has_granularity, uint32_t granularity, > + bool has_buf_size, int64_t buf_size, > + bool has_on_source_error, > + BlockdevOnError on_source_error, > + bool has_on_target_error, > + BlockdevOnError on_target_error, > + Error **errp) > +{ > + BlockDriverState *bs; > + BlockBackend *blk; > + BlockDriverState *target_bs; > + AioContext *aio_context; > + Error *local_err =3D NULL; > + > + blk =3D blk_by_name(device); > + if (!blk) { > + error_setg(errp, "Device '%s' not found", device); > + return; > + } > + bs =3D blk_bs(blk); > + > + if (!bs) { > + error_setg(errp, "Device '%s' has no media", device); > + return; > + } > + > + target_bs =3D bdrv_lookup_bs(target, target, errp); > + if (!target_bs) { > + return; > + } > + > + aio_context =3D bdrv_get_aio_context(bs); > + aio_context_acquire(aio_context); > + > + bdrv_ref(target_bs); > + bdrv_set_aio_context(target_bs, aio_context); > + > + blockdev_mirror_common(bs, target_bs, > + has_replaces, replaces, sync, > + has_speed, speed, > + has_granularity, granularity, > + has_buf_size, buf_size, > + has_on_source_error, on_source_error, > + has_on_target_error, on_target_error, > + true, true, Shouldn't this be "false, false,", or, ideally, set by the user? > + &local_err); > + if (local_err) { > + error_propagate(errp, local_err); > + bdrv_unref(target_bs); > + } > + > + aio_context_release(aio_context); > +} > + Max --WOQqkTfxfblEFBHn0tIaedXLS0oWQNGv8 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJWe0IHAAoJEDuxQgLoOKytZXcH/iaMV1zMgDKjrrQO5vjmf8DV xG1Mj8mygvuy5RRuP0wP3Ja3S4dTCPZtBYQAUnP0Mx3WUBDDn5YIzOqA/1I1nvLG 9Xs6Pr93GdW/Dd3pmhnHDheqRbTPeCdGUpLUuYq52rg1CuynXpQM3YmIB5Gnaok8 vK96wwZTh5AhZs91j8RcTC85CBtM3V5CdAHT7kdWn7qc+DW1PwyBWWB0Z4amsgtD VACLN7tDcjtmkzSIuS+wQOYMHYCLBT7DkN2ygzX/3T2mFWt3w/lDl4fCrVtRwSqB bi9bW//iiSMMmTb43NtY0mwTyhVSM3Z/VSf05nN/9vmMuywIZ1+i+eTfOpC7a0w= =5Iws -----END PGP SIGNATURE----- --WOQqkTfxfblEFBHn0tIaedXLS0oWQNGv8--