[Qemu-devel] [PULL 0/2] QAPI patches for 2017-02-20

[Qemu-devel] [PULL 0/2] QAPI patches for 2017-02-20

[Markus Armbruster]

The following changes since commit d514cfd763b271b4e97a9fc6adaabc8fd50084ab:

  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2017-02-20 09:53:59 +0000)

are available in the git repository at:

  git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2017-02-20

for you to fetch changes up to fea346f569d4132296f7c26367374fcace80e096:

  Makefile: Put VERSION info into version.texi rather than using -D (2017-02-20 14:11:07 +0100)

----------------------------------------------------------------
QAPI patches for 2017-02-20

----------------------------------------------------------------
Marc-André Lureau (1):
      qapi2texi: replace quotation by bold section name

Peter Maydell (1):
      Makefile: Put VERSION info into version.texi rather than using -D

 .gitignore             |  1 +
 Makefile               | 17 ++++++++++-------
 docs/qemu-ga-ref.texi  |  2 ++
 docs/qemu-qmp-ref.texi |  2 ++
 scripts/qapi2texi.py   | 10 ++++------
 5 files changed, 19 insertions(+), 13 deletions(-)

Marc-André Lureau (1):
  qapi2texi: replace quotation by bold section name

Peter Maydell (1):
  Makefile: Put VERSION info into version.texi rather than using -D

 .gitignore             |  1 +
 Makefile               | 17 ++++++++++-------
 docs/qemu-ga-ref.texi  |  2 ++
 docs/qemu-qmp-ref.texi |  2 ++
 scripts/qapi2texi.py   | 10 ++++------
 5 files changed, 19 insertions(+), 13 deletions(-)

-- 
2.7.4

[Qemu-devel] [PULL 1/2] qapi2texi: replace quotation by bold section name

[Markus Armbruster]

From: Marc-André Lureau <marcandre.lureau@redhat.com>

When we build qemu-qmp-ref.txt this causes texinfo to complain several
times:
"Negative repeat count does nothing at
/usr/share/texinfo/Texinfo/Convert/Line.pm line 124."

It also doesn't display correctly, because the "Notes" text disappears
entirely in the HTML version because it thinks there's no actual
quotation text.

The text file output formatting is also not good.

To solve those problems, remove usage of @quotation, and simply use bold
face for the section name.

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20170217093416.27688-1-marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 scripts/qapi2texi.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/scripts/qapi2texi.py b/scripts/qapi2texi.py
index 83ded95..c1071c6 100755
--- a/scripts/qapi2texi.py
+++ b/scripts/qapi2texi.py
@@ -159,12 +159,10 @@ def texi_body(doc):
             func = texi_example
 
         if name:
-            # FIXME the indentation produced by @quotation in .txt and
-            # .html output is confusing
-            body += "\n@quotation %s\n%s\n@end quotation" % \
-                    (name, func(doc))
-        else:
-            body += func(doc)
+            # prefer @b over @strong, so txt doesn't translate it to *Foo:*
+            body += "\n\n@b{%s:}\n" % name
+
+        body += func(doc)
 
     return body
 
-- 
2.7.4

[Qemu-devel] [PULL 2/2] Makefile: Put VERSION info into version.texi rather than using -D

[Markus Armbruster]

From: Peter Maydell <peter.maydell@linaro.org>

Unfortunately some older versions of makeinfo don't correctly
handle the -D command line option and fail to set the variable.
This then causes them to complain
 docs/qemu-ga-ref.texi:41: warning: undefined flag: VERSION

Work around this by doing as the autotools do, and writing
the information into a version.texi file which we then
include from the .texi files that need it.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1487357968-31000-1-git-send-email-peter.maydell@linaro.org>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 .gitignore             |  1 +
 Makefile               | 17 ++++++++++-------
 docs/qemu-ga-ref.texi  |  2 ++
 docs/qemu-qmp-ref.texi |  2 ++
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index c563dc1..2849d75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,6 +107,7 @@ docs/qemu-ga-ref.info*
 docs/qemu-qmp-ref.info*
 /qemu-ga-qapi.texi
 /qemu-qapi.texi
+/version.texi
 *.tps
 .stgit-*
 cscope.*
diff --git a/Makefile b/Makefile
index 830fa5a..1c4c04f 100644
--- a/Makefile
+++ b/Makefile
@@ -516,7 +516,7 @@ distclean: clean
 	rm -f qemu-doc.vr qemu-doc.txt
 	rm -f config.log
 	rm -f linux-headers/asm
-	rm -f qemu-ga-qapi.texi qemu-qapi.texi
+	rm -f qemu-ga-qapi.texi qemu-qapi.texi 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
@@ -663,21 +663,24 @@ ui/console-gl.o: $(SRC_PATH)/ui/console-gl.c \
 
 # documentation
 MAKEINFO=makeinfo
-MAKEINFOFLAGS=--no-split --number-sections -D 'VERSION $(VERSION)'
-TEXIFLAG=$(if $(V),,--quiet) --command='@set VERSION $(VERSION)'
+MAKEINFOFLAGS=--no-split --number-sections
+TEXIFLAG=$(if $(V),,--quiet)
 
-%.html: %.texi
+version.texi: $(SRC_PATH)/VERSION
+	$(call quiet-command,echo "@set VERSION $(VERSION)" > $@,"GEN","$@")
+
+%.html: %.texi version.texi
 	$(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers \
 	--html $< -o $@,"GEN","$@")
 
-%.info: %.texi
+%.info: %.texi version.texi
 	$(call quiet-command,$(MAKEINFO) $(MAKEINFOFLAGS) $< -o $@,"GEN","$@")
 
-%.txt: %.texi
+%.txt: %.texi version.texi
 	$(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers \
 	--plaintext $< -o $@,"GEN","$@")
 
-%.pdf: %.texi
+%.pdf: %.texi version.texi
 	$(call quiet-command,texi2pdf $(TEXIFLAG) -I $(SRC_PATH) -I . $< -o $@,"GEN","$@")
 
 qemu-options.texi: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool
diff --git a/docs/qemu-ga-ref.texi b/docs/qemu-ga-ref.texi
index 87cc8d0..ddb76ce 100644
--- a/docs/qemu-ga-ref.texi
+++ b/docs/qemu-ga-ref.texi
@@ -1,6 +1,8 @@
 \input texinfo
 @setfilename qemu-ga-ref.info
 
+@include version.texi
+
 @exampleindent 0
 @paragraphindent 0
 
diff --git a/docs/qemu-qmp-ref.texi b/docs/qemu-qmp-ref.texi
index 818e525..0a00569 100644
--- a/docs/qemu-qmp-ref.texi
+++ b/docs/qemu-qmp-ref.texi
@@ -1,6 +1,8 @@
 \input texinfo
 @setfilename qemu-qmp-ref.info
 
+@include version.texi
+
 @exampleindent 0
 @paragraphindent 0
 
-- 
2.7.4

Re: [Qemu-devel] [PULL 0/2] QAPI patches for 2017-02-20

[Peter Maydell]

On 20 February 2017 at 13:33, Markus Armbruster <armbru@redhat.com> wrote:
> The following changes since commit d514cfd763b271b4e97a9fc6adaabc8fd50084ab:
>
>   Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2017-02-20 09:53:59 +0000)
>
> are available in the git repository at:
>
>   git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2017-02-20
>
> for you to fetch changes up to fea346f569d4132296f7c26367374fcace80e096:
>
>   Makefile: Put VERSION info into version.texi rather than using -D (2017-02-20 14:11:07 +0100)
>
> ----------------------------------------------------------------
> QAPI patches for 2017-02-20
>
> ----------------------------------------------------------------
> Marc-André Lureau (1):
>       qapi2texi: replace quotation by bold section name
>
> Peter Maydell (1):
>       Makefile: Put VERSION info into version.texi rather than using -D
>
>  .gitignore             |  1 +
>  Makefile               | 17 ++++++++++-------
>  docs/qemu-ga-ref.texi  |  2 ++
>  docs/qemu-qmp-ref.texi |  2 ++
>  scripts/qapi2texi.py   | 10 ++++------
>  5 files changed, 19 insertions(+), 13 deletions(-)
>
> Marc-André Lureau (1):
>   qapi2texi: replace quotation by bold section name
>
> Peter Maydell (1):
>   Makefile: Put VERSION info into version.texi rather than using -D
>

Applied, thanks.

-- PMM

Re: [Qemu-devel] [PULL 0/2] QAPI patches for 2017-02-20

[Zhang Chen]

Hi~ Markus.

This patch set has been reviewed for a long time, can you pick up it?

[PATCH V7 0/2] Add new qmp commands to suppurt Xen COLO

Thanks

Zhang Chen


On 02/20/2017 09:33 PM, Markus Armbruster wrote:
> The following changes since commit d514cfd763b271b4e97a9fc6adaabc8fd50084ab:
>
>    Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2017-02-20 09:53:59 +0000)
>
> are available in the git repository at:
>
>    git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2017-02-20
>
> for you to fetch changes up to fea346f569d4132296f7c26367374fcace80e096:
>
>    Makefile: Put VERSION info into version.texi rather than using -D (2017-02-20 14:11:07 +0100)
>
> ----------------------------------------------------------------
> QAPI patches for 2017-02-20
>
> ----------------------------------------------------------------
> Marc-André Lureau (1):
>        qapi2texi: replace quotation by bold section name
>
> Peter Maydell (1):
>        Makefile: Put VERSION info into version.texi rather than using -D
>
>   .gitignore             |  1 +
>   Makefile               | 17 ++++++++++-------
>   docs/qemu-ga-ref.texi  |  2 ++
>   docs/qemu-qmp-ref.texi |  2 ++
>   scripts/qapi2texi.py   | 10 ++++------
>   5 files changed, 19 insertions(+), 13 deletions(-)
>
> Marc-André Lureau (1):
>    qapi2texi: replace quotation by bold section name
>
> Peter Maydell (1):
>    Makefile: Put VERSION info into version.texi rather than using -D
>
>   .gitignore             |  1 +
>   Makefile               | 17 ++++++++++-------
>   docs/qemu-ga-ref.texi  |  2 ++
>   docs/qemu-qmp-ref.texi |  2 ++
>   scripts/qapi2texi.py   | 10 ++++------
>   5 files changed, 19 insertions(+), 13 deletions(-)
>

-- 
Thanks
Zhang Chen

Re: [Qemu-devel] [PULL 0/2] QAPI patches for 2017-02-20

[Markus Armbruster]

Zhang Chen <zhangchen.fnst@cn.fujitsu.com> writes:

> Hi~ Markus.
>
> This patch set has been reviewed for a long time, can you pick up it?
>
> [PATCH V7 0/2] Add new qmp commands to suppurt Xen COLO

I think this should go through a COLO maintainer chain, or perhaps the
Xen maintainer, but not the QAPI maintainer (me).  QAPI guys should
provide review, so I just had a look.

Re: [Qemu-devel] [PULL 0/2] QAPI patches for 2017-02-20

[Zhang Chen]

On 02/21/2017 07:21 PM, Markus Armbruster wrote:
> Zhang Chen <zhangchen.fnst@cn.fujitsu.com> writes:
>
>> Hi~ Markus.
>>
>> This patch set has been reviewed for a long time, can you pick up it?
>>
>> [PATCH V7 0/2] Add new qmp commands to suppurt Xen COLO
> I think this should go through a COLO maintainer chain, or perhaps the
> Xen maintainer, but not the QAPI maintainer (me).  QAPI guys should
> provide review, so I just had a look.
>

OK, I got your point.

Thanks
Zhang Chen

>

-- 
Thanks
Zhang Chen