[Qemu-devel] [PATCH 1/2] build: fix missing trace dep on GENERATED_HEADERS

[Qemu-devel] [PATCH 1/2] build: fix missing trace dep on GENERATED_HEADERS

[Michael Roth]

fc764105 added an include for qemu-common.h to trace/control.h, which
made all users of this header file dependent on GENERATED_HEADERS. Since
it's used by pretty much all the trace backends now, make trace-obj-y
dependent on GENERATED_HEADERS.

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

diff --git a/Makefile.objs b/Makefile.objs
index 26b885b..a529a11 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -390,6 +390,8 @@ trace-nested-y += control.o
 
 trace-obj-y += $(addprefix trace/, $(trace-nested-y))
 
+$(trace-obj-y): $(GENERATED_HEADERS)
+
 ######################################################################
 # smartcard
 
-- 
1.7.0.4

[Qemu-devel] [PATCH 2/2] build: fix race with creating qapi-generated

[Michael Roth]

Since qapi-generated/ is a global QEMU include path, we need to make
sure it is created before anything is compiled, so do this in the
configure phase rather than via the Makefile.

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

diff --git a/configure b/configure
index c3044c7..0794f31 100755
--- a/configure
+++ b/configure
@@ -3612,7 +3612,7 @@ DIRS="tests tests/cris slirp audio block net pc-bios/optionrom"
 DIRS="$DIRS pc-bios/spapr-rtas"
 DIRS="$DIRS roms/seabios roms/vgabios"
 DIRS="$DIRS fsdev ui"
-DIRS="$DIRS qapi"
+DIRS="$DIRS qapi qapi-generated"
 DIRS="$DIRS qga trace"
 FILES="Makefile tests/Makefile"
 FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
-- 
1.7.0.4

Re: [Qemu-devel] [PATCH 1/2] build: fix missing trace dep on GENERATED_HEADERS

[Stefan Hajnoczi]

On Thu, Sep 8, 2011 at 12:40 AM, Michael Roth <mdroth@linux.vnet.ibm.com> wrote:
> fc764105 added an include for qemu-common.h to trace/control.h, which
> made all users of this header file dependent on GENERATED_HEADERS. Since
> it's used by pretty much all the trace backends now, make trace-obj-y
> dependent on GENERATED_HEADERS.
>
> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
> ---
>  Makefile.objs |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)

Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>

Re: [Qemu-devel] [PATCH 2/2] build: fix race with creating qapi-generated

[Anthony Liguori]

On 09/07/2011 06:40 PM, Michael Roth wrote:
> Since qapi-generated/ is a global QEMU include path, we need to make
> sure it is created before anything is compiled, so do this in the
> configure phase rather than via the Makefile.
>
> Signed-off-by: Michael Roth<mdroth@linux.vnet.ibm.com>

Applied.  Thanks.

Regards,

Anthony Liguori

> ---
>   configure |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/configure b/configure
> index c3044c7..0794f31 100755
> --- a/configure
> +++ b/configure
> @@ -3612,7 +3612,7 @@ DIRS="tests tests/cris slirp audio block net pc-bios/optionrom"
>   DIRS="$DIRS pc-bios/spapr-rtas"
>   DIRS="$DIRS roms/seabios roms/vgabios"
>   DIRS="$DIRS fsdev ui"
> -DIRS="$DIRS qapi"
> +DIRS="$DIRS qapi qapi-generated"
>   DIRS="$DIRS qga trace"
>   FILES="Makefile tests/Makefile"
>   FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"

Re: [Qemu-devel] [PATCH 2/2] build: fix race with creating qapi-generated

[Anthony Liguori]

On 09/07/2011 06:40 PM, Michael Roth wrote:
> Since qapi-generated/ is a global QEMU include path, we need to make
> sure it is created before anything is compiled, so do this in the
> configure phase rather than via the Makefile.
>
> Signed-off-by: Michael Roth<mdroth@linux.vnet.ibm.com>

Applied for real this time :-)  Thanks.

Regards,

Anthony Liguori

> ---
>   configure |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/configure b/configure
> index c3044c7..0794f31 100755
> --- a/configure
> +++ b/configure
> @@ -3612,7 +3612,7 @@ DIRS="tests tests/cris slirp audio block net pc-bios/optionrom"
>   DIRS="$DIRS pc-bios/spapr-rtas"
>   DIRS="$DIRS roms/seabios roms/vgabios"
>   DIRS="$DIRS fsdev ui"
> -DIRS="$DIRS qapi"
> +DIRS="$DIRS qapi qapi-generated"
>   DIRS="$DIRS qga trace"
>   FILES="Makefile tests/Makefile"
>   FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"