From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43735) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wznh9-0004dg-AK for qemu-devel@nongnu.org; Wed, 25 Jun 2014 09:57:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wznh2-00031T-M4 for qemu-devel@nongnu.org; Wed, 25 Jun 2014 09:57:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29725) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wznh2-0002y2-Ch for qemu-devel@nongnu.org; Wed, 25 Jun 2014 09:56:56 -0400 Message-ID: <53AAD523.3000604@redhat.com> Date: Wed, 25 Jun 2014 07:56:51 -0600 From: Eric Blake MIME-Version: 1.0 References: <4b996aea34144d33f2227835dc3d064818ffb7be.1403688576.git.mprivozn@redhat.com> In-Reply-To: <4b996aea34144d33f2227835dc3d064818ffb7be.1403688576.git.mprivozn@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ibmqv2QGrxMB0Ni3On2OO3ABgqUUDX3pi" Subject: Re: [Qemu-devel] [PATCH] Makefile: Install qmp-events.txt List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Michal Privoznik , qemu-devel@nongnu.org Cc: pbonzini@redhat.com, famz@redhat.com, Wenchao Xia , Luiz Capitulino This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --ibmqv2QGrxMB0Ni3On2OO3ABgqUUDX3pi Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 06/25/2014 03:30 AM, Michal Privoznik wrote: > Since fe069d9d5946 the qmp-events.txt does not exist anymore. This is > unhappy as users still may want to know what events they can await > from qemu. The .json files are a better contract of what is supported, anyways. >=20 > Signed-off-by: Michal Privoznik > --- > Makefile | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) >=20 > diff --git a/Makefile b/Makefile > index 145adb6..b93aa38 100644 > --- a/Makefile > +++ b/Makefile > @@ -77,7 +77,7 @@ LIBS+=3D-lz $(LIBS_TOOLS) > HELPERS-$(CONFIG_LINUX) =3D qemu-bridge-helper$(EXESUF) > =20 > ifdef BUILD_DOCS > -DOCS=3Dqemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 qmp-c= ommands.txt > +DOCS=3Dqemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 qmp-c= ommands.txt qmp-events.txt Then again, qmp-commands.txt is generated from qmp-commands.hx, which duplicates information already in qapi-schema.json (and friends, now). Would it be better to just install the .json files? Is it time to finally bite the bullet and figure out how to get rid of duplication by dropping qmp-commands.hx, and instead listing example usage directly in the qapi-schema.json file? I'm not sure if we have a good plan in place for user-facing documentation, even if the move to events-as-QAPI was desirable. > ifdef CONFIG_VIRTFS > DOCS+=3Dfsdev/virtfs-proxy-helper.1 > endif > @@ -353,6 +353,7 @@ install-doc: $(DOCS) > $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" > $(INSTALL_DATA) qemu-doc.html qemu-tech.html "$(DESTDIR)$(qemu_docdi= r)" > $(INSTALL_DATA) qmp-commands.txt "$(DESTDIR)$(qemu_docdir)" > + $(INSTALL_DATA) qmp-events.txt "$(DESTDIR)$(qemu_docdir)" > ifdef CONFIG_POSIX > $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" > $(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1" > @@ -455,6 +456,9 @@ qemu-monitor.texi: $(SRC_PATH)/hmp-commands.hx > qmp-commands.txt: $(SRC_PATH)/qmp-commands.hx > $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -q < $< > $@," GE= N $@") > =20 > +qmp-events.txt: $(SRC_PATH)/qapi-event.json > + $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GE= N $@") > + > qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx > $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@," GE= N $@") > =20 >=20 --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --ibmqv2QGrxMB0Ni3On2OO3ABgqUUDX3pi Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJTqtUjAAoJEKeha0olJ0NqNMYH/0tuO4IkKKyb9dnTCSrtHp8n ht7u2FOUld4jmrwo3vaeWx35G8f6M/YgYAnOWP9gaMfkv69T/Q0nRxlTUGGlqloC dSkMEtkjD6TkioGeSQgpUX/q6JNfOsvL8dDlt/En5lUYiqjkmx4E9ecH6W9pL4Vl uj2FnrjGWhBFcVMlaZH5DO4aqgIMCt8NsJ/xg9eaWcIvMTpvI8MyKFFARk1x+zCw AmoqvpJ5GXPjlrpq36K9DCj1Ucmf/VjLs296WzfnIjDvix8/DpZOgGKbax7uYuWZ DvR231hoCLOW2G4gICSmek/Jn7LlEGHgwOuNVbMawnEw3NSQrVx4fJ3EtZhuBXU= =bnen -----END PGP SIGNATURE----- --ibmqv2QGrxMB0Ni3On2OO3ABgqUUDX3pi--