From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58536) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZfVXZ-0005iD-5Q for qemu-devel@nongnu.org; Fri, 25 Sep 2015 12:08:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZfVXU-0003iS-Ob for qemu-devel@nongnu.org; Fri, 25 Sep 2015 12:08:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59425) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZfVXU-0003iK-H5 for qemu-devel@nongnu.org; Fri, 25 Sep 2015 12:08:00 -0400 References: <1443189844-20341-1-git-send-email-marcandre.lureau@redhat.com> <1443189844-20341-17-git-send-email-marcandre.lureau@redhat.com> From: Eric Blake Message-ID: <56056FD9.2060504@redhat.com> Date: Fri, 25 Sep 2015 10:01:29 -0600 MIME-Version: 1.0 In-Reply-To: <1443189844-20341-17-git-send-email-marcandre.lureau@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="vVAJiRosbqJIFv5SMjPPEDTKRRITpuGnq" Subject: Re: [Qemu-devel] [PATCH 16/36] qmp: register qapi commands (no middle mode) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: marcandre.lureau@redhat.com, qemu-devel@nongnu.org Cc: armbru@redhat.com, mdroth@linux.vnet.ibm.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --vVAJiRosbqJIFv5SMjPPEDTKRRITpuGnq Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 09/25/2015 08:03 AM, marcandre.lureau@redhat.com wrote: > From: Marc-Andr=C3=A9 Lureau >=20 > The marshal functions are no longer exported, they are registered in th= e > dispatch table instead. The following patches will make use of > qmp_dispatch(). This patch temporarily breaks qmp/hmp commands. Should this be squashed with the patch that fixes things? >=20 > Signed-off-by: Marc-Andr=C3=A9 Lureau > --- > Makefile | 2 +- > qmp-commands-old.h | 129 ---------------------------------------------= -------- > vl.c | 1 + > 3 files changed, 2 insertions(+), 130 deletions(-) >=20 > diff --git a/Makefile b/Makefile > index 5e09e88..9750b71 100644 > --- a/Makefile > +++ b/Makefile > @@ -289,7 +289,7 @@ $(qapi-modules) $(SRC_PATH)/scripts/qapi-event.py $= (qapi-py) > qmp-commands.h qmp-marshal.c :\ > $(qapi-modules) $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) > $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py \= > - $(gen-out-type) -o "." -m $<, \ > + $(gen-out-type) -o "." $<, \ > " GEN $@") > qmp-introspect.h qmp-introspect.c :\ > $(qapi-modules) $(SRC_PATH)/scripts/qapi-introspect.py $(qapi-py) > diff --git a/qmp-commands-old.h b/qmp-commands-old.h > index 3a7af18..956157d 100644 > --- a/qmp-commands-old.h > +++ b/qmp-commands-old.h > @@ -1,279 +1,225 @@ > { > .name =3D "quit", > .args_type =3D "", > - .mhandler.cmd_new =3D qmp_marshal_quit, > }, > { > .name =3D "eject", > .args_type =3D "force:-f,device:B", > - .mhandler.cmd_new =3D qmp_marshal_eject, Do we still need .args_type? Can it be generated instead of maintained by hand? --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --vVAJiRosbqJIFv5SMjPPEDTKRRITpuGnq 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/ iQEcBAEBCAAGBQJWBW/ZAAoJEKeha0olJ0NqoCUH/iPmcxSzZ1OOrYcM+t/sS0O1 swiUb43M14b2U0T62u+xeimZO2LVL4qb4iq27nqRqMcGn/Kb4BE085VdGnVESa+W c0vK2lnEKavRQH5H3KTeh6JdZIrVIS036Z8pNOZvFfVYrQrcIs8kA/2odYm4h+Au 1aCQpyb7pKdjjhG51k4vPPtEaQhZbwtfZQacDkPfmIY9DPv+2y3gTcIsxr+IaFjZ ODs9HcPJ03+lYKHsWJ63M3NCyj4fXrsDyuDCwVXupy93aHl0yDP8vG1cNV+6ftbB pFWLSVYmn+/n6Fz/wVIGf1XXBVuGK2XCEcx4rEgxriTUQzaAKu9waqsC+Vwybpk= =+LmO -----END PGP SIGNATURE----- --vVAJiRosbqJIFv5SMjPPEDTKRRITpuGnq--