jcs.org
qemu with hax to log dma reads & writes
jcs.org/2018/11/12/vfio
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-02-20' into staging
QAPI patches for 2017-02-20
# gpg: Signature made Mon 20 Feb 2017 13:31:12 GMT
# gpg: using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-qapi-2017-02-20:
Makefile: Put VERSION info into version.texi rather than using -D
qapi2texi: replace quotation by bold section name
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
+19
-13
+1
.gitignore
+1
.gitignore
+10
-7
Makefile
+10
-7
Makefile
···
516
516
rm -f qemu-doc.vr qemu-doc.txt
517
517
rm -f config.log
518
518
rm -f linux-headers/asm
519
-
rm -f qemu-ga-qapi.texi qemu-qapi.texi
519
+
rm -f qemu-ga-qapi.texi qemu-qapi.texi version.texi
520
520
rm -f docs/qemu-qmp-ref.7 docs/qemu-ga-ref.7
521
521
rm -f docs/qemu-qmp-ref.txt docs/qemu-ga-ref.txt
522
522
rm -f docs/qemu-qmp-ref.pdf docs/qemu-ga-ref.pdf
···
663
663
664
664
# documentation
665
665
MAKEINFO=makeinfo
666
-
MAKEINFOFLAGS=--no-split --number-sections -D 'VERSION $(VERSION)'
667
-
TEXIFLAG=$(if $(V),,--quiet) --command='@set VERSION $(VERSION)'
666
+
MAKEINFOFLAGS=--no-split --number-sections
667
+
TEXIFLAG=$(if $(V),,--quiet)
668
668
669
-
%.html: %.texi
669
+
version.texi: $(SRC_PATH)/VERSION
670
+
$(call quiet-command,echo "@set VERSION $(VERSION)" > $@,"GEN","$@")
671
+
672
+
%.html: %.texi version.texi
670
673
$(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers \
671
674
--html $< -o $@,"GEN","$@")
672
675
673
-
%.info: %.texi
676
+
%.info: %.texi version.texi
674
677
$(call quiet-command,$(MAKEINFO) $(MAKEINFOFLAGS) $< -o $@,"GEN","$@")
675
678
676
-
%.txt: %.texi
679
+
%.txt: %.texi version.texi
677
680
$(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers \
678
681
--plaintext $< -o $@,"GEN","$@")
679
682
680
-
%.pdf: %.texi
683
+
%.pdf: %.texi version.texi
681
684
$(call quiet-command,texi2pdf $(TEXIFLAG) -I $(SRC_PATH) -I . $< -o $@,"GEN","$@")
682
685
683
686
qemu-options.texi: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool
+2
docs/qemu-ga-ref.texi
+2
docs/qemu-ga-ref.texi
+2
docs/qemu-qmp-ref.texi
+2
docs/qemu-qmp-ref.texi
+4
-6
scripts/qapi2texi.py
+4
-6
scripts/qapi2texi.py
···
159
159
func = texi_example
160
160
161
161
if name:
162
-
# FIXME the indentation produced by @quotation in .txt and
163
-
# .html output is confusing
164
-
body += "\n@quotation %s\n%s\n@end quotation" % \
165
-
(name, func(doc))
166
-
else:
167
-
body += func(doc)
162
+
# prefer @b over @strong, so txt doesn't translate it to *Foo:*
163
+
body += "\n\n@b{%s:}\n" % name
164
+
165
+
body += func(doc)
168
166
169
167
return body
170
168