Patchwork [v2] test: remove qemu-ga reference

login
register
mail settings
Submitter Michael Roth
Date March 21, 2012, 3:10 p.m.
Message ID <1332342646-9250-1-git-send-email-mdroth@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/147992/
State New
Headers show

Comments

Michael Roth - March 21, 2012, 3:10 p.m.
This was added by mistake a while back.

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 Makefile       |    1 +
 tests/Makefile |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
Stefan Hajnoczi - March 22, 2012, 8:14 a.m.
On Wed, Mar 21, 2012 at 10:10:46AM -0500, Michael Roth wrote:
> This was added by mistake a while back.
> 
> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
> ---
>  Makefile       |    1 +
>  tests/Makefile |    2 +-
>  2 files changed, 2 insertions(+), 1 deletions(-)

Thanks, applied all 3 patches to the trivial patches tree:
https://github.com/stefanha/qemu/commits/trivial-patches

Stefan
Anthony Liguori - March 26, 2012, 8:07 p.m.
On 03/21/2012 10:10 AM, Michael Roth wrote:
> This was added by mistake a while back.
>
> Signed-off-by: Michael Roth<mdroth@linux.vnet.ibm.com>

Applied.  Thanks.

Regards,

Anthony Liguori

> ---
>   Makefile       |    1 +
>   tests/Makefile |    2 +-
>   2 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 1bc3cb0..cab7c74 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -173,6 +173,7 @@ qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
>   $(qapi-obj-y): $(GENERATED_HEADERS)
>   qapi-dir := $(BUILD_DIR)/qapi-generated
>   qemu-ga$(EXESUF): LIBS = $(LIBS_QGA)
> +qemu-ga$(EXESUF): QEMU_CFLAGS += -I $(qapi-dir)
>
>   gen-out-type = $(subst .,-,$(suffix $@))
>
> diff --git a/tests/Makefile b/tests/Makefile
> index c78ade1..354fdbb 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -17,7 +17,7 @@ test-coroutine: test-coroutine.o qemu-timer-common.o async.o $(coroutine-obj-y)
>
>   test-qmp-input-visitor.o test-qmp-output-visitor.o \
>   test-string-input-visitor.o test-string-output-visitor.o \
> -	test-qmp-commands.o qemu-ga$(EXESUF): QEMU_CFLAGS += -I $(qapi-dir)
> +	test-qmp-commands.o: QEMU_CFLAGS += -I $(qapi-dir)
>
>   $(qapi-dir)/test-qapi-types.c $(qapi-dir)/test-qapi-types.h :\
>   $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py

Patch

diff --git a/Makefile b/Makefile
index 1bc3cb0..cab7c74 100644
--- a/Makefile
+++ b/Makefile
@@ -173,6 +173,7 @@  qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
 $(qapi-obj-y): $(GENERATED_HEADERS)
 qapi-dir := $(BUILD_DIR)/qapi-generated
 qemu-ga$(EXESUF): LIBS = $(LIBS_QGA)
+qemu-ga$(EXESUF): QEMU_CFLAGS += -I $(qapi-dir)
 
 gen-out-type = $(subst .,-,$(suffix $@))
 
diff --git a/tests/Makefile b/tests/Makefile
index c78ade1..354fdbb 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -17,7 +17,7 @@  test-coroutine: test-coroutine.o qemu-timer-common.o async.o $(coroutine-obj-y)
 
 test-qmp-input-visitor.o test-qmp-output-visitor.o \
 test-string-input-visitor.o test-string-output-visitor.o \
-	test-qmp-commands.o qemu-ga$(EXESUF): QEMU_CFLAGS += -I $(qapi-dir)
+	test-qmp-commands.o: QEMU_CFLAGS += -I $(qapi-dir)
 
 $(qapi-dir)/test-qapi-types.c $(qapi-dir)/test-qapi-types.h :\
 $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py