From nobody Wed Nov 5 13:17:22 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1497282077078194.08516974078145; Mon, 12 Jun 2017 08:41:17 -0700 (PDT) Received: from localhost ([::1]:38762 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKRSo-0003qQ-Fr for importer@patchew.org; Mon, 12 Jun 2017 11:41:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42359) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKRQ9-0002Bf-Uk for qemu-devel@nongnu.org; Mon, 12 Jun 2017 11:38:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dKRQ6-0007Kb-VS for qemu-devel@nongnu.org; Mon, 12 Jun 2017 11:38:25 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:36185) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dKRQ6-0007KJ-LR for qemu-devel@nongnu.org; Mon, 12 Jun 2017 11:38:22 -0400 Received: by mail-wr0-x241.google.com with SMTP id e23so22871710wre.3 for ; Mon, 12 Jun 2017 08:38:22 -0700 (PDT) Received: from localhost.localdomain (94-39-191-51.adsl-ull.clienti.tiscali.it. [94.39.191.51]) by smtp.gmail.com with ESMTPSA id e130sm111362wmf.10.2017.06.12.08.38.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jun 2017 08:38:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=lz/Ms8PKoM17cQ385TzfwGd2Cjtxnuo3eYY+TuBHaLs=; b=jZgtxhqctp7vUcpASw9R8uvnJ92dfPFI3IyX6ujSqCVOuexp56sZQMNEDKU9y3c2Nb L7Esn6UYhuBqaaPuRGIRYnE94qxNJOcKnghX6ZDHIhtwdc4jeHZzIJiBur52pR/TeFe7 5s4RjC54IbnfIRRDsCQ39bbkqGc7mHhi6TflH46xUTU7gALSa/4fwQl1Qci28bzhp5gO hfOHEGFn154ZTsWK1M2vHXP4l1mlw6P681P+DHLUg2ZqW385Hf+7KYm0lKUkoFyjNQFz ltw8AcsrVjFHHCMUGU24avtXO6GewSPQ+jeuzlyPdyN9AfEiyV/Q8vUCRd3PbLAow1vN EEqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=lz/Ms8PKoM17cQ385TzfwGd2Cjtxnuo3eYY+TuBHaLs=; b=VJEgIizdsgSaPy7tpqErJvqHKTKTaNhCKE/vsaNkW05x+JG6r6kxg0XhZ68Rx/7AnR F1T7kNx2TPq2v0MjRVF5f1fAmiLTro7VLGOzu2IU3/5Dbj54ogClb4QyvYBOoiZTcST3 PyzCGr390THWhTMBzZ2C9JMjM8pthEdTuEIQhnQnAqkgfcyTokLhrKif7Hx/X28g5yUC BCY0POMbAPJkPxtqRfU40F4/+7ASvNDth4qUVy3YhVVFUiPUDPNX6d0AtBjEB9cZBDtn Y44kzu27Z8Eho2SPeYB8Tv1LhayTVM9QVmOilTQnui/aELKkzQCSjRGwWubwITf69c/0 nI3w== X-Gm-Message-State: AKS2vOzfCdWl870076xu8Uqnfwje9M9Q5iq742NU+lbiFIlQq1BKp44I +Sm43Fk3CwaYLukA6fo= X-Received: by 10.223.154.10 with SMTP id z10mr7699413wrb.76.1497281901226; Mon, 12 Jun 2017 08:38:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 12 Jun 2017 17:38:15 +0200 Message-Id: <20170612153816.15266-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170612153816.15266-1-pbonzini@redhat.com> References: <20170612153816.15266-1-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [PATCH 1/2] docs: create interop/ subdirectory X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, thuth@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This is for the future interoperability & management guide. It includes the QAPI docs, including the automatically generated ones, other socket protocols (vhost-user, VNC), and the qcow2 file format. Signed-off-by: Paolo Bonzini --- .gitignore | 16 ++--- Makefile | 69 +++++++++++++-----= ---- configure | 2 +- docs/{specs =3D> interop}/parallels.txt | 0 docs/{specs =3D> interop}/qcow2.txt | 0 docs/{specs =3D> interop}/qed_spec.txt | 0 docs/{ =3D> interop}/qemu-ga-ref.texi | 0 docs/{ =3D> interop}/qemu-qmp-ref.texi | 0 docs/{ =3D> interop}/qmp-intro.txt | 0 docs/{ =3D> interop}/qmp-spec.txt | 0 docs/{specs =3D> interop}/vhost-user.txt | 0 .../{ =3D> interop}/vnc-ledstate-Pseudo-encoding.txt | 0 rules.mak | 2 +- 13 files changed, 50 insertions(+), 39 deletions(-) rename docs/{specs =3D> interop}/parallels.txt (100%) rename docs/{specs =3D> interop}/qcow2.txt (100%) rename docs/{specs =3D> interop}/qed_spec.txt (100%) rename docs/{ =3D> interop}/qemu-ga-ref.texi (100%) rename docs/{ =3D> interop}/qemu-qmp-ref.texi (100%) rename docs/{ =3D> interop}/qmp-intro.txt (100%) rename docs/{ =3D> interop}/qmp-spec.txt (100%) rename docs/{specs =3D> interop}/vhost-user.txt (100%) rename docs/{ =3D> interop}/vnc-ledstate-Pseudo-encoding.txt (100%) diff --git a/.gitignore b/.gitignore index 55a001e3b8..11bb1b12da 100644 --- a/.gitignore +++ b/.gitignore @@ -99,14 +99,14 @@ /pc-bios/optionrom/kvmvapic.img /pc-bios/s390-ccw/s390-ccw.elf /pc-bios/s390-ccw/s390-ccw.img -/docs/qemu-ga-qapi.texi -/docs/qemu-ga-ref.html -/docs/qemu-ga-ref.info* -/docs/qemu-ga-ref.txt -/docs/qemu-qmp-qapi.texi -/docs/qemu-qmp-ref.html -/docs/qemu-qmp-ref.info* -/docs/qemu-qmp-ref.txt +/docs/interop/qemu-ga-qapi.texi +/docs/interop/qemu-ga-ref.html +/docs/interop/qemu-ga-ref.info* +/docs/interop/qemu-ga-ref.txt +/docs/interop/qemu-qmp-qapi.texi +/docs/interop/qemu-qmp-ref.html +/docs/interop/qemu-qmp-ref.info* +/docs/interop/qemu-qmp-ref.txt /docs/version.texi *.tps .stgit-* diff --git a/Makefile b/Makefile index 32d4441697..c27389af28 100644 --- a/Makefile +++ b/Makefile @@ -207,8 +207,8 @@ HELPERS-$(CONFIG_LINUX) =3D qemu-bridge-helper$(EXESUF) =20 ifdef BUILD_DOCS DOCS=3Dqemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 -DOCS+=3Ddocs/qemu-qmp-ref.html docs/qemu-qmp-ref.txt docs/qemu-qmp-ref.7 -DOCS+=3Ddocs/qemu-ga-ref.html docs/qemu-ga-ref.txt docs/qemu-ga-ref.7 +DOCS+=3Ddocs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/= interop/qemu-qmp-ref.7 +DOCS+=3Ddocs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.txt docs/in= terop/qemu-ga-ref.7 ifdef CONFIG_VIRTFS DOCS+=3Dfsdev/virtfs-proxy-helper.1 endif @@ -519,11 +519,12 @@ distclean: clean rm -f qemu-doc.vr qemu-doc.txt rm -f config.log rm -f linux-headers/asm - rm -f docs/qemu-ga-qapi.texi docs/qemu-qmp-qapi.texi docs/version.texi - rm -f docs/qemu-qmp-ref.7 docs/qemu-ga-ref.7 - rm -f docs/qemu-qmp-ref.txt docs/qemu-ga-ref.txt - rm -f docs/qemu-qmp-ref.pdf docs/qemu-ga-ref.pdf - rm -f docs/qemu-qmp-ref.html docs/qemu-ga-ref.html + rm -f docs/version.texi + rm -f docs/interop/qemu-ga-qapi.texi docs/interop/qemu-qmp-qapi.texi + rm -f docs/interop/qemu-qmp-ref.7 docs/interop/qemu-ga-ref.7 + rm -f docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.txt + rm -f docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf + rm -f docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html for d in $(TARGET_DIRS); do \ rm -rf $$d || exit 1 ; \ done @@ -562,13 +563,13 @@ install-doc: $(DOCS) $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) qemu-doc.html "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) qemu-doc.txt "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) docs/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) docs/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)" + $(INSTALL_DATA) docs/interop/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)" + $(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)" ifdef CONFIG_POSIX $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" $(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1" $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man7" - $(INSTALL_DATA) docs/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7" + $(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7" ifneq ($(TOOLS),) $(INSTALL_DATA) qemu-img.1 "$(DESTDIR)$(mandir)/man1" $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8" @@ -576,9 +577,9 @@ ifneq ($(TOOLS),) endif ifneq (,$(findstring qemu-ga,$(TOOLS))) $(INSTALL_DATA) qemu-ga.8 "$(DESTDIR)$(mandir)/man8" - $(INSTALL_DATA) docs/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) docs/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) docs/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7" + $(INSTALL_DATA) docs/interop/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)" + $(INSTALL_DATA) docs/interop/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)" + $(INSTALL_DATA) docs/interop/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7" endif endif ifdef CONFIG_VIRTFS @@ -666,8 +667,10 @@ ui/console-gl.o: $(SRC_PATH)/ui/console-gl.c \ =20 # documentation MAKEINFO=3Dmakeinfo -MAKEINFOFLAGS=3D--no-split --number-sections -I docs -TEXIFLAG=3D$(if $(V),,--quiet) +MAKEINFOINCLUDES=3D -I docs -I $( $@,"GEN","$@") @@ -684,10 +687,14 @@ docs/version.texi: $(SRC_PATH)/VERSION --plaintext $< -o $@,"GEN","$@") =20 %.pdf: %.texi - $(call quiet-command,texi2pdf $(TEXIFLAG) -I $(SRC_PATH) -I docs $< -o $@= ,"GEN","$@") + $(call quiet-command,texi2pdf $(TEXI2PDFFLAGS) $< -o $@,"GEN","$@") =20 -docs/qemu-ga-ref.html docs/qemu-ga-ref.info docs/qemu-ga-ref.txt docs/qemu= -ga-ref.pdf docs/qemu-ga-ref.7.pod: docs/version.texi -docs/qemu-qmp-ref.html docs/qemu-qmp-ref.info docs/qemu-qmp-ref.txt docs/q= emu-qmp-ref.pdf docs/qemu-qmp-ref.pod: docs/version.texi +docs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.info \ + docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.pdf \ + docs/interop/qemu-ga-ref.7.pod: docs/version.texi +docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.info \ + docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.pdf \ + docs/interop/qemu-qmp-ref.pod: docs/version.texi =20 qemu-options.texi: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"GEN","$@= ") @@ -701,12 +708,12 @@ qemu-monitor-info.texi: $(SRC_PATH)/hmp-commands-info= .hx $(SRC_PATH)/scripts/hxt qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"GEN","$@= ") =20 -docs/qemu-qmp-qapi.texi docs/qemu-ga-qapi.texi: $(SRC_PATH)/scripts/qapi2t= exi.py $(qapi-py) +docs/interop/qemu-qmp-qapi.texi docs/interop/qemu-ga-qapi.texi: $(SRC_PATH= )/scripts/qapi2texi.py $(qapi-py) =20 -docs/qemu-qmp-qapi.texi: $(qapi-modules) +docs/interop/qemu-qmp-qapi.texi: $(qapi-modules) $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi2texi.py $< > $@,"= GEN","$@") =20 -docs/qemu-ga-qapi.texi: $(SRC_PATH)/qga/qapi-schema.json +docs/interop/qemu-ga-qapi.texi: $(SRC_PATH)/qga/qapi-schema.json $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi2texi.py $< > $@,"= GEN","$@") =20 qemu.1: qemu-doc.texi qemu-options.texi qemu-monitor.texi qemu-monitor-inf= o.texi @@ -716,21 +723,25 @@ fsdev/virtfs-proxy-helper.1: fsdev/virtfs-proxy-helpe= r.texi qemu-nbd.8: qemu-nbd.texi qemu-option-trace.texi qemu-ga.8: qemu-ga.texi =20 -html: qemu-doc.html docs/qemu-qmp-ref.html docs/qemu-ga-ref.html -info: qemu-doc.info docs/qemu-qmp-ref.info docs/qemu-ga-ref.info -pdf: qemu-doc.pdf docs/qemu-qmp-ref.pdf docs/qemu-ga-ref.pdf -txt: qemu-doc.txt docs/qemu-qmp-ref.txt docs/qemu-ga-ref.txt +html: qemu-doc.html docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-re= f.html +info: qemu-doc.info docs/interop/qemu-qmp-ref.info docs/interop/qemu-ga-re= f.info +pdf: qemu-doc.pdf docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.p= df +txt: qemu-doc.txt docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.t= xt =20 qemu-doc.html qemu-doc.info qemu-doc.pdf qemu-doc.txt: \ qemu-img.texi qemu-nbd.texi qemu-options.texi qemu-option-trace.texi \ qemu-monitor.texi qemu-img-cmds.texi qemu-ga.texi \ qemu-monitor-info.texi =20 -docs/qemu-ga-ref.dvi docs/qemu-ga-ref.html docs/qemu-ga-ref.info docs/qemu= -ga-ref.pdf docs/qemu-ga-ref.txt docs/qemu-ga-ref.7: \ -docs/qemu-ga-ref.texi docs/qemu-ga-qapi.texi +docs/interop/qemu-ga-ref.dvi docs/interop/qemu-ga-ref.html \ + docs/interop/qemu-ga-ref.info docs/interop/qemu-ga-ref.pdf \ + docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.7: \ + docs/interop/qemu-ga-ref.texi docs/interop/qemu-ga-qapi.texi =20 -docs/qemu-qmp-ref.dvi docs/qemu-qmp-ref.html docs/qemu-qmp-ref.info docs/q= emu-qmp-ref.pdf docs/qemu-qmp-ref.txt docs/qemu-qmp-ref.7: \ -docs/qemu-qmp-ref.texi docs/qemu-qmp-qapi.texi +docs/interop/qemu-qmp-ref.dvi docs/interop/qemu-qmp-ref.html \ + docs/interop/qemu-qmp-ref.info docs/interop/qemu-qmp-ref.pdf \ + docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7: \ + docs/interop/qemu-qmp-ref.texi docs/interop/qemu-qmp-qapi.texi =20 =20 ifdef CONFIG_WIN32 diff --git a/configure b/configure index f438525db8..f4c5d7f6d2 100755 --- a/configure +++ b/configure @@ -6365,7 +6365,7 @@ fi =20 # build tree in object directory in case the source is not in the current = directory DIRS=3D"tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos tests/q= api-schema tests/tcg/xtensa tests/qemu-iotests" -DIRS=3D"$DIRS docs fsdev" +DIRS=3D"$DIRS docs docs/interop fsdev" DIRS=3D"$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw" DIRS=3D"$DIRS roms/seabios roms/vgabios" DIRS=3D"$DIRS qapi-generated" diff --git a/docs/specs/parallels.txt b/docs/interop/parallels.txt similarity index 100% rename from docs/specs/parallels.txt rename to docs/interop/parallels.txt diff --git a/docs/specs/qcow2.txt b/docs/interop/qcow2.txt similarity index 100% rename from docs/specs/qcow2.txt rename to docs/interop/qcow2.txt diff --git a/docs/specs/qed_spec.txt b/docs/interop/qed_spec.txt similarity index 100% rename from docs/specs/qed_spec.txt rename to docs/interop/qed_spec.txt diff --git a/docs/qemu-ga-ref.texi b/docs/interop/qemu-ga-ref.texi similarity index 100% rename from docs/qemu-ga-ref.texi rename to docs/interop/qemu-ga-ref.texi diff --git a/docs/qemu-qmp-ref.texi b/docs/interop/qemu-qmp-ref.texi similarity index 100% rename from docs/qemu-qmp-ref.texi rename to docs/interop/qemu-qmp-ref.texi diff --git a/docs/qmp-intro.txt b/docs/interop/qmp-intro.txt similarity index 100% rename from docs/qmp-intro.txt rename to docs/interop/qmp-intro.txt diff --git a/docs/qmp-spec.txt b/docs/interop/qmp-spec.txt similarity index 100% rename from docs/qmp-spec.txt rename to docs/interop/qmp-spec.txt diff --git a/docs/specs/vhost-user.txt b/docs/interop/vhost-user.txt similarity index 100% rename from docs/specs/vhost-user.txt rename to docs/interop/vhost-user.txt diff --git a/docs/vnc-ledstate-Pseudo-encoding.txt b/docs/interop/vnc-ledst= ate-Pseudo-encoding.txt similarity index 100% rename from docs/vnc-ledstate-Pseudo-encoding.txt rename to docs/interop/vnc-ledstate-Pseudo-encoding.txt diff --git a/rules.mak b/rules.mak index 1c0eabb367..f95195b569 100644 --- a/rules.mak +++ b/rules.mak @@ -380,7 +380,7 @@ define unnest-vars endef =20 TEXI2MAN =3D $(call quiet-command, \ - perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl -I docs $< $@.pod && \ + perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $(TEXI2PODFLAGS) $< $@.pod &&= \ $(POD2MAN) --section=3D$(subst .,,$(suffix $@)) --center=3D" " --release= =3D" " $@.pod > $@, \ "GEN","$@") =20 --=20 2.13.0 From nobody Wed Nov 5 13:17:22 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1497281987829242.6778145683263; Mon, 12 Jun 2017 08:39:47 -0700 (PDT) Received: from localhost ([::1]:38750 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKRRR-0002yn-Jn for importer@patchew.org; Mon, 12 Jun 2017 11:39:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42357) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKRQ9-0002Be-UQ for qemu-devel@nongnu.org; Mon, 12 Jun 2017 11:38:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dKRQ7-0007Kv-Qk for qemu-devel@nongnu.org; Mon, 12 Jun 2017 11:38:25 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:36186) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dKRQ7-0007KY-Jr for qemu-devel@nongnu.org; Mon, 12 Jun 2017 11:38:23 -0400 Received: by mail-wr0-x243.google.com with SMTP id e23so22871780wre.3 for ; Mon, 12 Jun 2017 08:38:23 -0700 (PDT) Received: from localhost.localdomain (94-39-191-51.adsl-ull.clienti.tiscali.it. [94.39.191.51]) by smtp.gmail.com with ESMTPSA id e130sm111362wmf.10.2017.06.12.08.38.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jun 2017 08:38:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=GMWdfK5iIR3ei5WpwZ0dhZ6gzF+XlO5SwVCBLbisC/4=; b=jYzPDsnSkw99pPBEhRzzGlAfZH+MSup2US485HXYsn/SPVvGSdLEYI1CiyP5sZWPfI rMwCySXAI5b7gaKC4cKPMM+tFLOiL7RXVrxQXzGZPz9SwTbajRtMMp1Ds6YlvM8eOhFy 4C8pJ3v43xYrV07+N89u3df8chcY8inPtC+3ju6tpkfXdiS9TO9bZeS+AZOV4e7+hc6i 4fM8HtG8/INcP+iU/ARAuLYY5PfR/hGK6X4npwr+7XuGXMJR7ogbfgy1NfSrBtPmjZYl VTY9yBzxewIqwJgYp1Sb/bflnN0i8K8epQNMfOOjBSaUgR/51FvdENvyG80nLNCeqlIK e3iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=GMWdfK5iIR3ei5WpwZ0dhZ6gzF+XlO5SwVCBLbisC/4=; b=aS/Wdpa3oPFljQAZzYWwVn1AGlZGFh9XWxI2Q4YF6RaNWOterXmEph1TToywLFzX45 znTpKx24pPENN1TwqUgKY1C4wYAS6rOj2/WNMH9+hNUklP5bP0/bfn1oaAF0IBVo0p40 1LrVB19Wq+sQ+kfRF0GjrhXsxb8VTxGTo4faEADuMejpiKw3fGV4Ho9zVzI685B8SKDF 5v/PHOJS/AJFdvLB9xWmrnyT2sNEOcbo4M/pkXB+7cS/nUeC8qA3ZOOS4v/7N+69uSt7 K0Bl7mA+aIeFNZZVWD5iYrxjP0hBGx8VDGVFgBlxmHllOD2aOqVw6rOtSZcFvreROlfY dYSQ== X-Gm-Message-State: AODbwcCtAPNEvkQ4zCPvE0Zz31BRnoaJr3eLJ0IcUNPBwsU5zJkFKXHn /eqc19JUeZkKooQT1gc= X-Received: by 10.223.155.217 with SMTP id e25mr7764356wrc.55.1497281902309; Mon, 12 Jun 2017 08:38:22 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 12 Jun 2017 17:38:16 +0200 Message-Id: <20170612153816.15266-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170612153816.15266-1-pbonzini@redhat.com> References: <20170612153816.15266-1-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 Subject: [Qemu-devel] [PATCH 2/2] qemu-doc: include version number X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, thuth@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Note that TEXI2POD doesn't support @set/@clear, so pass the value manually on the command line. This patch partially undoes commit bd7f974796 ("qapi: Clean up build of generated documentation", 2017-03-16). Signed-off-by: Paolo Bonzini --- Makefile | 17 +++++------------ qemu-doc.texi | 5 +++-- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index c27389af28..b017e3abf8 100644 --- a/Makefile +++ b/Makefile @@ -669,33 +669,26 @@ ui/console-gl.o: $(SRC_PATH)/ui/console-gl.c \ MAKEINFO=3Dmakeinfo MAKEINFOINCLUDES=3D -I docs -I $( $@,"GEN","$@") =20 -%.html: %.texi +%.html: %.texi docs/version.texi $(call quiet-command,LC_ALL=3DC $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers= \ --html $< -o $@,"GEN","$@") =20 -%.info: %.texi +%.info: %.texi docs/version.texi $(call quiet-command,$(MAKEINFO) $(MAKEINFOFLAGS) $< -o $@,"GEN","$@") =20 -%.txt: %.texi +%.txt: %.texi docs/version.texi $(call quiet-command,LC_ALL=3DC $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers= \ --plaintext $< -o $@,"GEN","$@") =20 -%.pdf: %.texi +%.pdf: %.texi docs/version.texi $(call quiet-command,texi2pdf $(TEXI2PDFFLAGS) $< -o $@,"GEN","$@") =20 -docs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.info \ - docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.pdf \ - docs/interop/qemu-ga-ref.7.pod: docs/version.texi -docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.info \ - docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.pdf \ - docs/interop/qemu-qmp-ref.pod: docs/version.texi - qemu-options.texi: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"GEN","$@= ") =20 diff --git a/qemu-doc.texi b/qemu-doc.texi index 965ba5929e..21079fd675 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -1,11 +1,12 @@ \input texinfo @c -*- texinfo -*- @c %**start of header @setfilename qemu-doc.info +@include version.texi =20 @documentlanguage en @documentencoding UTF-8 =20 -@settitle QEMU Emulator User Documentation +@settitle QEMU version @value{VERSION} User Documentation @exampleindent 0 @paragraphindent 0 @c %**end of header @@ -19,7 +20,7 @@ @iftex @titlepage @sp 7 -@center @titlefont{QEMU Emulator} +@center @titlefont{QEMU version @value{VERSION}} @sp 1 @center @titlefont{User Documentation} @sp 3 --=20 2.13.0