* [Qemu-devel] [PATCH 2/3] qapi: remove print statements from test-qmp-commands
2012-03-20 0:18 [Qemu-devel] [PATCH 1/3] test: remove qemu-ga reference Michael Roth
@ 2012-03-20 0:18 ` Michael Roth
2012-03-20 0:18 ` [Qemu-devel] [PATCH 3/3] test: add test-qmp-commands to make check Michael Roth
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Michael Roth @ 2012-03-20 0:18 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, pbonzini
This is necessary for nicer make check integration.
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
test-qmp-commands.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/test-qmp-commands.c b/test-qmp-commands.c
index fa5a7bd..60cbf01 100644
--- a/test-qmp-commands.c
+++ b/test-qmp-commands.c
@@ -46,7 +46,6 @@ static void test_dispatch_cmd(void)
resp = qmp_dispatch(QOBJECT(req));
assert(resp != NULL);
assert(!qdict_haskey(qobject_to_qdict(resp), "error"));
- g_print("\nresp: %s\n", qstring_get_str(qobject_to_json(resp)));
qobject_decref(resp);
QDECREF(req);
@@ -63,7 +62,6 @@ static void test_dispatch_cmd_error(void)
resp = qmp_dispatch(QOBJECT(req));
assert(resp != NULL);
assert(qdict_haskey(qobject_to_qdict(resp), "error"));
- g_print("\nresp: %s\n", qstring_get_str(qobject_to_json_pretty(resp)));
qobject_decref(resp);
QDECREF(req);
@@ -92,7 +90,6 @@ static void test_dispatch_cmd_io(void)
resp = qmp_dispatch(QOBJECT(req));
assert(resp != NULL);
assert(!qdict_haskey(qobject_to_qdict(resp), "error"));
- g_print("\nresp: %s\n", qstring_get_str(qobject_to_json_pretty(resp)));
qobject_decref(resp);
QDECREF(req);
--
1.7.4.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Qemu-devel] [PATCH 3/3] test: add test-qmp-commands to make check
2012-03-20 0:18 [Qemu-devel] [PATCH 1/3] test: remove qemu-ga reference Michael Roth
2012-03-20 0:18 ` [Qemu-devel] [PATCH 2/3] qapi: remove print statements from test-qmp-commands Michael Roth
@ 2012-03-20 0:18 ` Michael Roth
2012-03-21 11:37 ` [Qemu-devel] [PATCH 1/3] test: remove qemu-ga reference Stefan Hajnoczi
2012-03-21 15:10 ` [Qemu-devel] [PATCH v2] " Michael Roth
3 siblings, 0 replies; 8+ messages in thread
From: Michael Roth @ 2012-03-20 0:18 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, pbonzini
All the deps are here but the test was never added to the list of tests
for make check
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
tests/Makefile | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/tests/Makefile b/tests/Makefile
index 354fdbb..94ea342 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -3,6 +3,7 @@ export SRC_PATH
CHECKS = check-qdict check-qfloat check-qint check-qstring check-qlist
CHECKS += check-qjson test-qmp-output-visitor test-qmp-input-visitor
CHECKS += test-string-input-visitor test-string-output-visitor test-coroutine
+CHECKS += test-qmp-commands
CHECKS += $(SRC_PATH)/tests/qemu-iotests-quick.sh
check-qint.o check-qstring.o check-qdict.o check-qlist.o check-qfloat.o check-qjson.o test-coroutine.o: $(GENERATED_HEADERS)
--
1.7.4.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH 1/3] test: remove qemu-ga reference
2012-03-20 0:18 [Qemu-devel] [PATCH 1/3] test: remove qemu-ga reference Michael Roth
2012-03-20 0:18 ` [Qemu-devel] [PATCH 2/3] qapi: remove print statements from test-qmp-commands Michael Roth
2012-03-20 0:18 ` [Qemu-devel] [PATCH 3/3] test: add test-qmp-commands to make check Michael Roth
@ 2012-03-21 11:37 ` Stefan Hajnoczi
2012-03-21 15:06 ` Michael Roth
2012-03-21 15:10 ` [Qemu-devel] [PATCH v2] " Michael Roth
3 siblings, 1 reply; 8+ messages in thread
From: Stefan Hajnoczi @ 2012-03-21 11:37 UTC (permalink / raw)
To: Michael Roth; +Cc: qemu-trivial, pbonzini, qemu-devel
On Tue, Mar 20, 2012 at 12:18 AM, Michael Roth
<mdroth@linux.vnet.ibm.com> wrote:
> This was added by mistake a while back.
>
> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
> ---
> tests/Makefile | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
After applying your series and rebuilding, I get the following error.
I checked that there are no auto-generated files left around after
make distclean.
$ make distclean
$ ./configure --target-list=x86_64-softmmu --disable-werror
$ make
GEN x86_64-softmmu/config-devices.mak
GEN config-all-devices.mak
GEN qemu-options.texi
GEN qemu-monitor.texi
GEN qemu-img-cmds.texi
GEN qemu-doc.html
GEN qemu-tech.html
GEN qemu.1
GEN qemu-img.1
GEN qemu-nbd.8
GEN QMP/qmp-commands.txt
GEN config-host.h
GEN trace.h
GEN qemu-options.def
GEN qmp-commands.h
GEN qapi-types.h
GEN qapi-visit.h
GEN /home/stefanha/qemu/qapi-generated/qga-qapi-types.h
GEN /home/stefanha/qemu/qapi-generated/qga-qapi-visit.h
GEN /home/stefanha/qemu/qapi-generated/qga-qmp-commands.h
CC qemu-ga.o
CC qga/commands.o
qga/commands.c:15:30: fatal error: qga-qmp-commands.h: No such file or directory
compilation terminated.
make: *** [qga/commands.o] Error 1
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH 1/3] test: remove qemu-ga reference
2012-03-21 11:37 ` [Qemu-devel] [PATCH 1/3] test: remove qemu-ga reference Stefan Hajnoczi
@ 2012-03-21 15:06 ` Michael Roth
0 siblings, 0 replies; 8+ messages in thread
From: Michael Roth @ 2012-03-21 15:06 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-trivial, pbonzini, qemu-devel
On Wed, Mar 21, 2012 at 11:37:10AM +0000, Stefan Hajnoczi wrote:
> On Tue, Mar 20, 2012 at 12:18 AM, Michael Roth
> <mdroth@linux.vnet.ibm.com> wrote:
> > This was added by mistake a while back.
> >
> > Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
> > ---
> > tests/Makefile | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
>
> After applying your series and rebuilding, I get the following error.
> I checked that there are no auto-generated files left around after
> make distclean.
Shoot, sorry, I must've only tested make check after the change. It looks
like qemu-ga target is relying on that dependency being sourced from
tests/Makefile. I'll send an updated 1/3 that moves it to top-level
Makefile where it should be.
>
> $ make distclean
> $ ./configure --target-list=x86_64-softmmu --disable-werror
> $ make
> GEN x86_64-softmmu/config-devices.mak
> GEN config-all-devices.mak
> GEN qemu-options.texi
> GEN qemu-monitor.texi
> GEN qemu-img-cmds.texi
> GEN qemu-doc.html
> GEN qemu-tech.html
> GEN qemu.1
> GEN qemu-img.1
> GEN qemu-nbd.8
> GEN QMP/qmp-commands.txt
> GEN config-host.h
> GEN trace.h
> GEN qemu-options.def
> GEN qmp-commands.h
> GEN qapi-types.h
> GEN qapi-visit.h
> GEN /home/stefanha/qemu/qapi-generated/qga-qapi-types.h
> GEN /home/stefanha/qemu/qapi-generated/qga-qapi-visit.h
> GEN /home/stefanha/qemu/qapi-generated/qga-qmp-commands.h
> CC qemu-ga.o
> CC qga/commands.o
> qga/commands.c:15:30: fatal error: qga-qmp-commands.h: No such file or directory
> compilation terminated.
> make: *** [qga/commands.o] Error 1
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Qemu-devel] [PATCH v2] test: remove qemu-ga reference
2012-03-20 0:18 [Qemu-devel] [PATCH 1/3] test: remove qemu-ga reference Michael Roth
` (2 preceding siblings ...)
2012-03-21 11:37 ` [Qemu-devel] [PATCH 1/3] test: remove qemu-ga reference Stefan Hajnoczi
@ 2012-03-21 15:10 ` Michael Roth
2012-03-22 8:14 ` Stefan Hajnoczi
2012-03-26 20:07 ` Anthony Liguori
3 siblings, 2 replies; 8+ messages in thread
From: Michael Roth @ 2012-03-21 15:10 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, stefanha
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(-)
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
--
1.7.4.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [Qemu-devel] [PATCH v2] test: remove qemu-ga reference
2012-03-21 15:10 ` [Qemu-devel] [PATCH v2] " Michael Roth
@ 2012-03-22 8:14 ` Stefan Hajnoczi
2012-03-26 20:07 ` Anthony Liguori
1 sibling, 0 replies; 8+ messages in thread
From: Stefan Hajnoczi @ 2012-03-22 8:14 UTC (permalink / raw)
To: Michael Roth; +Cc: qemu-trivial, qemu-devel
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH v2] test: remove qemu-ga reference
2012-03-21 15:10 ` [Qemu-devel] [PATCH v2] " Michael Roth
2012-03-22 8:14 ` Stefan Hajnoczi
@ 2012-03-26 20:07 ` Anthony Liguori
1 sibling, 0 replies; 8+ messages in thread
From: Anthony Liguori @ 2012-03-26 20:07 UTC (permalink / raw)
To: Michael Roth; +Cc: qemu-trivial, stefanha, qemu-devel
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
^ permalink raw reply [flat|nested] 8+ messages in thread