Patchwork Fix test suite build with tracing enabled

login
register
mail settings
Submitter Jan Kiszka
Date Oct. 19, 2010, 2:03 p.m.
Message ID <4CBDA523.9020407@siemens.com>
Download mbox | patch
Permalink /patch/68337/
State New
Headers show

Comments

Jan Kiszka - Oct. 19, 2010, 2:03 p.m.
qemu_malloc instrumentations require linking against the trace objects.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 Makefile |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
Stefan Hajnoczi - Oct. 19, 2010, 2:17 p.m.
On Tue, Oct 19, 2010 at 04:03:15PM +0200, Jan Kiszka wrote:
> qemu_malloc instrumentations require linking against the trace objects.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  Makefile |   12 ++++++------
>  1 files changed, 6 insertions(+), 6 deletions(-)

Acked-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Luiz Capitulino - Oct. 20, 2010, 4:57 p.m.
On Tue, 19 Oct 2010 16:03:15 +0200
Jan Kiszka <jan.kiszka@siemens.com> wrote:

> qemu_malloc instrumentations require linking against the trace objects.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

Applied to the Monitor queue, thanks.

> ---
>  Makefile |   12 ++++++------
>  1 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 252c817..106a401 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -140,12 +140,12 @@ qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
>  
>  check-qint.o check-qstring.o check-qdict.o check-qlist.o check-qfloat.o check-qjson.o: $(GENERATED_HEADERS)
>  
> -check-qint: check-qint.o qint.o qemu-malloc.o
> -check-qstring: check-qstring.o qstring.o qemu-malloc.o
> -check-qdict: check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qemu-malloc.o qlist.o
> -check-qlist: check-qlist.o qlist.o qint.o qemu-malloc.o
> -check-qfloat: check-qfloat.o qfloat.o qemu-malloc.o
> -check-qjson: check-qjson.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o qjson.o json-streamer.o json-lexer.o json-parser.o qemu-malloc.o
> +check-qint: check-qint.o qint.o qemu-malloc.o $(trace-obj-y)
> +check-qstring: check-qstring.o qstring.o qemu-malloc.o $(trace-obj-y)
> +check-qdict: check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qemu-malloc.o qlist.o $(trace-obj-y)
> +check-qlist: check-qlist.o qlist.o qint.o qemu-malloc.o $(trace-obj-y)
> +check-qfloat: check-qfloat.o qfloat.o qemu-malloc.o $(trace-obj-y)
> +check-qjson: check-qjson.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o qjson.o json-streamer.o json-lexer.o json-parser.o qemu-malloc.o $(trace-obj-y)
>  
>  clean:
>  # avoid old build problems by removing potentially incorrect old files

Patch

diff --git a/Makefile b/Makefile
index 252c817..106a401 100644
--- a/Makefile
+++ b/Makefile
@@ -140,12 +140,12 @@  qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
 
 check-qint.o check-qstring.o check-qdict.o check-qlist.o check-qfloat.o check-qjson.o: $(GENERATED_HEADERS)
 
-check-qint: check-qint.o qint.o qemu-malloc.o
-check-qstring: check-qstring.o qstring.o qemu-malloc.o
-check-qdict: check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qemu-malloc.o qlist.o
-check-qlist: check-qlist.o qlist.o qint.o qemu-malloc.o
-check-qfloat: check-qfloat.o qfloat.o qemu-malloc.o
-check-qjson: check-qjson.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o qjson.o json-streamer.o json-lexer.o json-parser.o qemu-malloc.o
+check-qint: check-qint.o qint.o qemu-malloc.o $(trace-obj-y)
+check-qstring: check-qstring.o qstring.o qemu-malloc.o $(trace-obj-y)
+check-qdict: check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qemu-malloc.o qlist.o $(trace-obj-y)
+check-qlist: check-qlist.o qlist.o qint.o qemu-malloc.o $(trace-obj-y)
+check-qfloat: check-qfloat.o qfloat.o qemu-malloc.o $(trace-obj-y)
+check-qjson: check-qjson.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o qjson.o json-streamer.o json-lexer.o json-parser.o qemu-malloc.o $(trace-obj-y)
 
 clean:
 # avoid old build problems by removing potentially incorrect old files