[Qemu-devel] [PATCH for-4.1 0/2] qemu-doc build fixes

[Qemu-devel] [PATCH for-4.1 0/2] qemu-doc build fixes

[Markus Armbruster]

*** BLURB HERE ***

Markus Armbruster (2):
  Makefile: Fix missing dependency of on qemu-tech.texi
  qemu-tech: Fix dangling @menu entries

 Makefile       | 3 ++-
 qemu-tech.texi | 3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)

-- 
2.21.0

[Qemu-devel] [PATCH for-4.1 1/2] Makefile: Fix missing dependency of on qemu-tech.texi

[Markus Armbruster]

The qemu-doc.{html,info,pdf,txt} depend on qemu-doc.texi and its
include files.  Except qemu-tech.texi is missing.  Has always been
missing as far as I can see.  Fix it.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1fcbaed62c..8212a1446c 100644
--- a/Makefile
+++ b/Makefile
@@ -1020,7 +1020,8 @@ pdf: qemu-doc.pdf docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf
 txt: qemu-doc.txt docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.txt
 
 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-img.texi qemu-nbd.texi qemu-options.texi \
+	qemu-tech.texi qemu-option-trace.texi \
 	qemu-deprecated.texi qemu-monitor.texi qemu-img-cmds.texi qemu-ga.texi \
 	qemu-monitor-info.texi docs/qemu-block-drivers.texi \
 	docs/qemu-cpu-models.texi docs/security.texi
-- 
2.21.0

[Qemu-devel] [PATCH for-4.1 2/2] qemu-tech: Fix dangling @menu entries

[Markus Armbruster]

Recent commit 2f2c4e4731 "Convert "translator internals" docs to RST,
move to devel manual" and commit 282d36b5e2 "qemu-tech.texi: Remove
"QEMU compared to other emulators" section" removed @node, but left
their @menu entries behind.  This broke building qemu-doc.info (but
not qemu-doc.{html,pdf,txt}; how odd).  Bury the dead @menu entries.

Reported-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Fixes: 2f2c4e4731449449a2b1aafcd73e4f9ae107d78b
Fixes: 282d36b5e27ba86d42d0638430e439c2c257367b
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 qemu-tech.texi | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/qemu-tech.texi b/qemu-tech.texi
index 3451cfaa5b..0380de77b6 100644
--- a/qemu-tech.texi
+++ b/qemu-tech.texi
@@ -3,10 +3,7 @@
 
 @menu
 * CPU emulation::
-* Translator Internals::
-* QEMU compared to other emulators::
 * Managed start up options::
-* Bibliography::
 @end menu
 
 @node CPU emulation
-- 
2.21.0

Re: [Qemu-devel] [PATCH for-4.1 2/2] qemu-tech: Fix dangling @menu entries

[Peter Maydell]

On Mon, 15 Jul 2019 at 06:57, Markus Armbruster <armbru@redhat.com> wrote:
>
> Recent commit 2f2c4e4731 "Convert "translator internals" docs to RST,
> move to devel manual" and commit 282d36b5e2 "qemu-tech.texi: Remove
> "QEMU compared to other emulators" section" removed @node, but left
> their @menu entries behind.  This broke building qemu-doc.info (but
> not qemu-doc.{html,pdf,txt}; how odd).  Bury the dead @menu entries.
>
> Reported-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Fixes: 2f2c4e4731449449a2b1aafcd73e4f9ae107d78b
> Fixes: 282d36b5e27ba86d42d0638430e439c2c257367b
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  qemu-tech.texi | 3 ---
>  1 file changed, 3 deletions(-)
>
> diff --git a/qemu-tech.texi b/qemu-tech.texi
> index 3451cfaa5b..0380de77b6 100644
> --- a/qemu-tech.texi
> +++ b/qemu-tech.texi
> @@ -3,10 +3,7 @@
>
>  @menu
>  * CPU emulation::
> -* Translator Internals::
> -* QEMU compared to other emulators::
>  * Managed start up options::
> -* Bibliography::
>  @end menu

Whoops...

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM

Re: [Qemu-devel] [PATCH for-4.1 0/2] qemu-doc build fixes

[Philippe Mathieu-Daudé]

On 7/15/19 7:57 AM, Markus Armbruster wrote:
> Markus Armbruster (2):
>   Makefile: Fix missing dependency of on qemu-tech.texi
>   qemu-tech: Fix dangling @menu entries
> 
>  Makefile       | 3 ++-
>  qemu-tech.texi | 3 ---
>  2 files changed, 2 insertions(+), 4 deletions(-)

Series:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Thanks!