[Qemu-devel] [PATCH] Makefile: Fix parallel building after a clean tree

[Qemu-devel] [PATCH] Makefile: Fix parallel building after a clean tree

[Stefan Berger]

This patch fixes a compilation error when building qemu after 'make clean'
by parallel building using 'make -j6' for example. A dependency seems to be missing.

  GEN   qemu-options.def
  GEN   trace.h
  GEN   qapi-generated/qga-qapi-types.h
  GEN   qapi-generated/qga-qapi-visit.h
  GEN   qapi-generated/qga-qmp-marshal.c
  CC    qga/guest-agent-command-state.o
  CC    qga/guest-agent-commands.o
  GEN   trace.c
  GEN   qemu-img-cmds.h
cc1: error: qapi-generated: No such file or directory [-Werror]
cc1: all warnings being treated as errors


Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>

---
 Makefile |    2 ++
 1 file changed, 2 insertions(+)

Index: qemu-git/Makefile
===================================================================
--- qemu-git.orig/Makefile
+++ qemu-git/Makefile
@@ -192,6 +192,8 @@ test-qmp-commands.o: $(addprefix $(qapi-
 test-qmp-commands: test-qmp-commands.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o $(qapi-obj-y) error.o osdep.o qemu-malloc.o $(oslib-obj-y) qjson.o json-streamer.o json-lexer.o json-parser.o qerror.o qemu-error.o qemu-tool.o $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o $(qapi-dir)/test-qmp-marshal.o module.o
 
 QGALIB=qga/guest-agent-command-state.o qga/guest-agent-commands.o
+$(QGALIB): qemu-ga.o
+
 
 qemu-ga.o: $(addprefix $(qapi-dir)/, qga-qapi-types.c qga-qapi-types.h qga-qapi-visit.c qga-qmp-marshal.c) $(qapi-obj-y)
 qemu-ga$(EXESUF): qemu-ga.o $(QGALIB) qemu-tool.o qemu-error.o error.o $(oslib-obj-y) $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) $(qapi-obj-y) qemu-timer-common.o qemu-sockets.o module.o qapi/qmp-dispatch.o qapi/qmp-registry.o $(qapi-dir)/qga-qapi-visit.o $(qapi-dir)/qga-qapi-types.o $(qapi-dir)/qga-qmp-marshal.o

Re: [Qemu-devel] [Qemu-trivial] [PATCH] Makefile: Fix parallel building after a clean tree

[Michael Roth]

On 07/26/2011 09:33 AM, Stefan Berger wrote:
> This patch fixes a compilation error when building qemu after 'make clean'
> by parallel building using 'make -j6' for example. A dependency seems to be missing.
>
>    GEN   qemu-options.def
>    GEN   trace.h
>    GEN   qapi-generated/qga-qapi-types.h
>    GEN   qapi-generated/qga-qapi-visit.h
>    GEN   qapi-generated/qga-qmp-marshal.c
>    CC    qga/guest-agent-command-state.o
>    CC    qga/guest-agent-commands.o
>    GEN   trace.c
>    GEN   qemu-img-cmds.h
> cc1: error: qapi-generated: No such file or directory [-Werror]
> cc1: all warnings being treated as errors
>
>
> Signed-off-by: Stefan Berger<stefanb@linux.vnet.ibm.com>
>
> ---
>   Makefile |    2 ++
>   1 file changed, 2 insertions(+)
>
> Index: qemu-git/Makefile
> ===================================================================
> --- qemu-git.orig/Makefile
> +++ qemu-git/Makefile
> @@ -192,6 +192,8 @@ test-qmp-commands.o: $(addprefix $(qapi-
>   test-qmp-commands: test-qmp-commands.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o $(qapi-obj-y) error.o osdep.o qemu-malloc.o $(oslib-obj-y) qjson.o json-streamer.o json-lexer.o json-parser.o qerror.o qemu-error.o qemu-tool.o $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o $(qapi-dir)/test-qmp-marshal.o module.o
>
>   QGALIB=qga/guest-agent-command-state.o qga/guest-agent-commands.o
> +$(QGALIB): qemu-ga.o
> +
>
>   qemu-ga.o: $(addprefix $(qapi-dir)/, qga-qapi-types.c qga-qapi-types.h qga-qapi-visit.c qga-qmp-marshal.c) $(qapi-obj-y)
>   qemu-ga$(EXESUF): qemu-ga.o $(QGALIB) qemu-tool.o qemu-error.o error.o $(oslib-obj-y) $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) $(qapi-obj-y) qemu-timer-common.o qemu-sockets.o module.o qapi/qmp-dispatch.o qapi/qmp-registry.o $(qapi-dir)/qga-qapi-visit.o $(qapi-dir)/qga-qapi-types.o $(qapi-dir)/qga-qmp-marshal.o
>
>

Hi Stefan,

Thanks for catching this. It seems to do the trick for me up until make 
-j10, where a missing dependency on $(GENERATED_HEADERS) becomes an 
issue. I'll have a patch I'll send shortly.

[Qemu-devel] [PATCH] Makefile: add missing deps on $(GENERATED_HEADERS)

[Michael Roth]

This fixes a build issue with make -j6+ due to qapi-generated files
being built before $(GENERATED_HEADERS) have been created.

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 Makefile |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index daa3aa0..0a31633 100644
--- a/Makefile
+++ b/Makefile
@@ -192,8 +192,10 @@ test-qmp-commands.o: $(addprefix $(qapi-dir)/, test-qapi-types.c test-qapi-types
 test-qmp-commands: test-qmp-commands.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o $(qapi-obj-y) error.o osdep.o qemu-malloc.o $(oslib-obj-y) qjson.o json-streamer.o json-lexer.o json-parser.o qerror.o qemu-error.o qemu-tool.o $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o $(qapi-dir)/test-qmp-marshal.o module.o
 
 QGALIB=qga/guest-agent-command-state.o qga/guest-agent-commands.o
+QGALIB_GEN=$(addprefix $(qapi-dir)/, qga-qapi-types.c qga-qapi-types.h qga-qapi-visit.c qga-qmp-marshal.c)
 
-qemu-ga.o: $(addprefix $(qapi-dir)/, qga-qapi-types.c qga-qapi-types.h qga-qapi-visit.c qga-qmp-marshal.c) $(qapi-obj-y)
+$(QGALIB_GEN): $(GENERATED_HEADERS)
+$(QGALIB) qemu-ga.o: $(QGALIB_GEN) $(qapi-obj-y)
 qemu-ga$(EXESUF): qemu-ga.o $(QGALIB) qemu-tool.o qemu-error.o error.o $(oslib-obj-y) $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) $(qapi-obj-y) qemu-timer-common.o qemu-sockets.o module.o qapi/qmp-dispatch.o qapi/qmp-registry.o $(qapi-dir)/qga-qapi-visit.o $(qapi-dir)/qga-qapi-types.o $(qapi-dir)/qga-qmp-marshal.o
 
 QEMULIBS=libhw32 libhw64 libuser libdis libdis-user
-- 
1.7.0.4

Re: [Qemu-devel] [PATCH] Makefile: add missing deps on $(GENERATED_HEADERS)

[Stefan Berger]

On 07/26/2011 12:39 PM, Michael Roth wrote:
> This fixes a build issue with make -j6+ due to qapi-generated files
> being built before $(GENERATED_HEADERS) have been created.
>
> Signed-off-by: Michael Roth<mdroth@linux.vnet.ibm.com>
Tested-by: Stefan Berger <stefanb@linux.vnet.ibm.com>

> ---
>   Makefile |    4 +++-
>   1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index daa3aa0..0a31633 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -192,8 +192,10 @@ test-qmp-commands.o: $(addprefix $(qapi-dir)/, test-qapi-types.c test-qapi-types
>   test-qmp-commands: test-qmp-commands.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o $(qapi-obj-y) error.o osdep.o qemu-malloc.o $(oslib-obj-y) qjson.o json-streamer.o json-lexer.o json-parser.o qerror.o qemu-error.o qemu-tool.o $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o $(qapi-dir)/test-qmp-marshal.o module.o
>
>   QGALIB=qga/guest-agent-command-state.o qga/guest-agent-commands.o
> +QGALIB_GEN=$(addprefix $(qapi-dir)/, qga-qapi-types.c qga-qapi-types.h qga-qapi-visit.c qga-qmp-marshal.c)
>
> -qemu-ga.o: $(addprefix $(qapi-dir)/, qga-qapi-types.c qga-qapi-types.h qga-qapi-visit.c qga-qmp-marshal.c) $(qapi-obj-y)
> +$(QGALIB_GEN): $(GENERATED_HEADERS)
> +$(QGALIB) qemu-ga.o: $(QGALIB_GEN) $(qapi-obj-y)
>   qemu-ga$(EXESUF): qemu-ga.o $(QGALIB) qemu-tool.o qemu-error.o error.o $(oslib-obj-y) $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) $(qapi-obj-y) qemu-timer-common.o qemu-sockets.o module.o qapi/qmp-dispatch.o qapi/qmp-registry.o $(qapi-dir)/qga-qapi-visit.o $(qapi-dir)/qga-qapi-types.o $(qapi-dir)/qga-qmp-marshal.o
>
>   QEMULIBS=libhw32 libhw64 libuser libdis libdis-user

Re: [Qemu-devel] [Qemu-trivial] [PATCH] Makefile: add missing deps on $(GENERATED_HEADERS)

[Stefan Hajnoczi]

On Tue, Jul 26, 2011 at 11:39:24AM -0500, Michael Roth wrote:
> This fixes a build issue with make -j6+ due to qapi-generated files
> being built before $(GENERATED_HEADERS) have been created.
> 
> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
> ---
>  Makefile |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)

Thanks, applied to the trivial patches tree:
http://repo.or.cz/w/qemu/stefanha.git/shortlog/refs/heads/trivial-patches

Stefan