From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBrGZ-00027r-Hd for qemu-devel@nongnu.org; Wed, 23 Dec 2015 16:48:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aBrGW-0004Px-Ap for qemu-devel@nongnu.org; Wed, 23 Dec 2015 16:48:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48833) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBrGW-0004Pt-2w for qemu-devel@nongnu.org; Wed, 23 Dec 2015 16:48:12 -0500 References: <1449240275-26196-1-git-send-email-den@openvz.org> <1449240275-26196-4-git-send-email-den@openvz.org> From: Eric Blake Message-ID: <567B169A.6000104@redhat.com> Date: Wed, 23 Dec 2015 14:48:10 -0700 MIME-Version: 1.0 In-Reply-To: <1449240275-26196-4-git-send-email-den@openvz.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="LmhXOX1QrLH21j7vqcf1GbhTG6GOH5t28" Subject: Re: [Qemu-devel] [PATCH 3/5] qmp: create qmp_delvm command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Denis V. Lunev" Cc: Amit Shah , Markus Armbruster , qemu-devel@nongnu.org, quintela@redhat.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --LmhXOX1QrLH21j7vqcf1GbhTG6GOH5t28 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 12/04/2015 07:44 AM, Denis V. Lunev wrote: > The patch also moves hmp_delvm implementation into hmp.c. This function= > is just a simple wrapper now and does not have knowledge about > migration internals. >=20 > Signed-off-by: Denis V. Lunev > CC: Juan Quintela > CC: Amit Shah > CC: Markus Armbruster > CC: Eric Blake > --- > hmp.c | 11 +++++++++++ > migration/savevm.c | 16 +++++++--------- > qapi-schema.json | 13 +++++++++++++ > qmp-commands.hx | 23 +++++++++++++++++++++++ > 4 files changed, 54 insertions(+), 9 deletions(-) >=20 > diff --git a/hmp.c b/hmp.c > index c9c7100..a342c8c 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -2390,3 +2390,14 @@ void hmp_savevm(Monitor *mon, const QDict *qdict= ) > error_report_err(local_err); > } > } > + > +void hmp_delvm(Monitor *mon, const QDict *qdict) > +{ > + Error *local_err =3D NULL; Same comment as earlier, about 'err' vs. 'local_err' naming, > + > + qmp_delvm(qdict_get_str(qdict, "name"), &local_err); > + > + if (local_err !=3D NULL) { and redundant comparison to NULL. > +++ b/migration/savevm.c > @@ -2099,17 +2099,15 @@ int load_vmstate(const char *name) > return 0; > } > =20 > -void hmp_delvm(Monitor *mon, const QDict *qdict) > +void qmp_delvm(const char *name, Error **errp) > { > BlockDriverState *bs; > - Error *err; > - const char *name =3D qdict_get_str(qdict, "name"); > - > - if (bdrv_all_delete_snapshot(name, &bs, &err) < 0) { > - monitor_printf(mon, > - "Error while deleting snapshot on device '%s': = %s\n", > - bdrv_get_device_name(bs), error_get_pretty(err)= ); > - error_free(err); > + Error *local_err =3D NULL; Instead of renaming 'err' to 'local_err', > + > + if (bdrv_all_delete_snapshot(name, &bs, &local_err) < 0) { > + error_setg(errp, "Error while deleting snapshot on device '%s'= : %s", > + bdrv_get_device_name(bs), error_get_pretty(local_er= r)); you'll want to use Markus' proposed error prefixing code. > +SQMP > +delvm > +------------------ Divider too long. --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --LmhXOX1QrLH21j7vqcf1GbhTG6GOH5t28 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 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJWexaaAAoJEKeha0olJ0Nq4IsIAJ5/us65S2qHscBHgDFdeOC+ RSr4ttFXgAzirOAMIBBepkFUVe3ZjhTqf23zpdytiKrC6NoZ2OGX5+K+/oQId/Ug nqnC/a3D7YSdXVwINgPaNBwhLmSnWgwIEox1GQr3wSCMUMHgB0tCL9E4VjuVDYoB cQoKdF5zkgKdijg5rAdQfeb1pY+Bi7NBfbnjltGNY7GAnda1+vfjZorePxlKy4z1 CSBGW0HVnJ6U7QJP0oILVV95/HZthqf+goBSbqDWVF3/0a35fPGdmrMf8w69Hp10 1HGILQ/HaV7Os7xQKFpBEQIhWva2keko5FdT6Y71aYVgynU4JOblPaR+bvvmcTc= =ebWd -----END PGP SIGNATURE----- --LmhXOX1QrLH21j7vqcf1GbhTG6GOH5t28--