From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47311) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBsdG-0000aE-88 for qemu-devel@nongnu.org; Wed, 23 Dec 2015 18:15:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aBsdB-0007FQ-PZ for qemu-devel@nongnu.org; Wed, 23 Dec 2015 18:15:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50849) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBsdB-0007F8-Ha for qemu-devel@nongnu.org; Wed, 23 Dec 2015 18:15:41 -0500 References: <1449240275-26196-1-git-send-email-den@openvz.org> <1449240275-26196-6-git-send-email-den@openvz.org> From: Eric Blake Message-ID: <567B2B16.7060705@redhat.com> Date: Wed, 23 Dec 2015 16:15:34 -0700 MIME-Version: 1.0 In-Reply-To: <1449240275-26196-6-git-send-email-den@openvz.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="LOdNvdtLtj0eAU7bNGlkr8ah5x04SbQFB" Subject: Re: [Qemu-devel] [PATCH 5/5] qmp: create QMP implementation of loadvm 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) --LOdNvdtLtj0eAU7bNGlkr8ah5x04SbQFB Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 12/04/2015 07:44 AM, Denis V. Lunev wrote: > Unfortunately load_vmstate has a return code (int) and this code is che= cked > in the other places. Thus we could not just rename it to qmp_loadvm as > returns void. >=20 > Signed-off-by: Denis V. Lunev > CC: Juan Quintela > CC: Amit Shah > CC: Markus Armbruster > CC: Eric Blake > --- > migration/savevm.c | 12 ++++++++++++ > monitor.c | 12 ++++++------ > qapi-schema.json | 13 +++++++++++++ > qmp-commands.hx | 23 +++++++++++++++++++++++ > 4 files changed, 54 insertions(+), 6 deletions(-) >=20 > diff --git a/migration/savevm.c b/migration/savevm.c > index 7846437..07b0bf4 100644 > --- a/migration/savevm.c > +++ b/migration/savevm.c > @@ -2103,6 +2103,18 @@ int load_vmstate(const char *name, Error **errp)= > return 0; > } > =20 > +void qmp_loadvm(const char *name, Error **errp) > +{ > + int saved_vm_running =3D runstate_is_running(); > + vm_stop(RUN_STATE_RESTORE_VM); > + > + load_vmstate(name, errp); > + > + if (saved_vm_running) { > + vm_start(); Do you really mean to be calling vm_start() even if an error was reported? But to properly short-circuit, you need a local 'Error *err =3D= NULL; load_vmstate(name, &err);', rather than reusing errp (since the caller may pass in NULL). > +++ b/monitor.c > @@ -1737,18 +1737,18 @@ void qmp_closefd(const char *fdname, Error **er= rp) > =20 > static void hmp_loadvm(Monitor *mon, const QDict *qdict) > { > - int saved_vm_running =3D runstate_is_running(); > const char *name =3D qdict_get_str(qdict, "name"); > Error *local_err =3D NULL; > =20 > - vm_stop(RUN_STATE_RESTORE_VM); > + if (name =3D=3D NULL) { Dead code. qdict_get_str() crashes rather than returning NULL, if "name" is not present. > +++ b/qmp-commands.hx > @@ -4787,3 +4787,26 @@ EQMP > .args_type =3D "name:s", > .mhandler.cmd_new =3D qmp_marshal_delvm, > }, > + > +SQMP > +loadvm > +------------------ Line too long. --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --LOdNvdtLtj0eAU7bNGlkr8ah5x04SbQFB 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/ iQEcBAEBCAAGBQJWeysWAAoJEKeha0olJ0NqVuMH/3IYC84yZUvSJoFP7D0JWYMY T392fpWG5TN7lSQotRh6GI6sdGUscwo0zZQz/zQwFxuvi4l5MMNT+2ieCY26rQub b9rCiicF8AcGGl2SJ02LBhf5pVDpd13A+i0F8AqQb/RaSq3wgKUBAAzr2Rp2QtWu VYprRqSONFrd3Jn9wG33Toa7VBmk61wK9cL4bWz2SWteZnQUOPanxBBeKM4Xk+U/ FbhpCF9tzPZO25u0XRtMb18RoFyuSWe+3nO1qkwMtkparDI6VcRA+jaT0kewnd9g XprDYOpNpuxBQs3Xb10d4NDEeJZkADKPL0/wpClHZR1v77x36D/8LLe/PYAi4ak= =IHvm -----END PGP SIGNATURE----- --LOdNvdtLtj0eAU7bNGlkr8ah5x04SbQFB--