From 49cb826e8f66760d377cb2028b4274b9538d36e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 16 Jan 2012 01:46:52 +0100 Subject: [PATCH 1/5] qemu-tool: Fix mixup of int64 and int64_t MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit cbcfa0418f0c196afa765f5c9837b9344d1adcf3 (link the main loop and its dependencies into the tools) introduced stray usages of int64. Use int64_t instead. Signed-off-by: Andreas Färber Cc: Paolo Bonzini Signed-off-by: Stefan Hajnoczi --- qemu-tool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu-tool.c b/qemu-tool.c index c73bf7152e..6b69668258 100644 --- a/qemu-tool.c +++ b/qemu-tool.c @@ -59,12 +59,12 @@ void monitor_protocol_event(MonitorEvent event, QObject *data) { } -int64 cpu_get_clock(void) +int64_t cpu_get_clock(void) { abort(); } -int64 cpu_get_icount(void) +int64_t cpu_get_icount(void) { abort(); } From 3c941c613a398ca62a9852f5bd29c1400ceffb3a Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Mon, 16 Jan 2012 07:26:27 +0100 Subject: [PATCH 2/5] tests: Silence gtester in Makefile This prettifies make output a little by avoiding a very long line. As gtester prints the checks when they are run, no information is lost. Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- tests/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile b/tests/Makefile index efde63a5f3..55e8eb0ad5 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -36,4 +36,4 @@ test-qmp-commands: test-qmp-commands.o $(qobject-obj-y) $(qapi-obj-y) $(tools-ob .PHONY: check check: $(CHECKS) - gtester $(CHECKS) + $(call quiet-command, gtester $(CHECKS), " CHECK") From 0f3c3cc9507872e8d06ae888b70eac055a6a39f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 17 Jan 2012 10:44:40 +0100 Subject: [PATCH 3/5] lm32: Fix mixup of uint32 and uint32_t MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit d23948b15a9920fb7f6374b55a6db1ecff81f3ee (lm32: add Milkymist VGAFB support) introduced a stray usage of the softfloat uint32 type. Use uint32_t instead. Signed-off-by: Andreas Färber Acked-by: Michael Walle Cc: Peter Maydell Signed-off-by: Stefan Hajnoczi --- hw/milkymist-vgafb_template.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/milkymist-vgafb_template.h b/hw/milkymist-vgafb_template.h index 69af9ef3f6..1d33ee8b50 100644 --- a/hw/milkymist-vgafb_template.h +++ b/hw/milkymist-vgafb_template.h @@ -39,7 +39,7 @@ #elif BITS == 24 #define COPY_PIXEL(to, r, g, b) \ do { \ - uint32 tmp = rgb_to_pixel24(r, g, b); \ + uint32_t tmp = rgb_to_pixel24(r, g, b); \ *(to++) = tmp & 0xff; \ *(to++) = (tmp >> 8) & 0xff; \ *(to++) = (tmp >> 16) & 0xff; \ From e454e2e258e4a35ec164ec3bd5c168df56011513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 17 Jan 2012 13:16:05 +0100 Subject: [PATCH 4/5] Makefile: Exclude tests/Makefile in unconfigured tree MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since commit dbfe06c62ccedc5b64e1c6466445133dd50f6de1 (build: split unit test builds to a separate makefile fragment), in absence of config-host.mak an undefined $(SRC_PATH) breaks `make distclean' due to /tests/Makefile not being include'able. Fix by only including when config-host.mak is present. Signed-off-by: Andreas Färber Cc: Anthony Liguori Signed-off-by: Stefan Hajnoczi --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 2bbc547108..d356f07051 100644 --- a/Makefile +++ b/Makefile @@ -168,7 +168,9 @@ qemu-ga$(EXESUF): LIBS = $(LIBS_QGA) gen-out-type = $(subst .,-,$(suffix $@)) +ifneq ($(wildcard config-host.mak),) include $(SRC_PATH)/tests/Makefile +endif $(qapi-dir)/qga-qapi-types.c $(qapi-dir)/qga-qapi-types.h :\ $(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-types.py From dcfa486817c12ea41165265cfaaa236d11968626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 17 Jan 2012 13:17:38 +0100 Subject: [PATCH 5/5] Makefile: Remove generated headers on clean MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Running `make distclean' followed by a new out-of-tree build would fail due to stale generated QMP headers in the tree. Commit 611b727374ad76fb0078ea65bc1387194913980e (Makefile: remove more generated files on clean) made sure generated sources are removed. Also remove generated headers introduced in commit e3193601c84558c303b1773379da76fce80c0a56 (qapi: use middle mode in QMP server). Signed-off-by: Andreas Färber Cc: Michael S. Tsirkin Cc: Paolo Bonzini Cc: Luiz Capitulino Signed-off-by: Stefan Hajnoczi --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index d356f07051..917fb9bd7d 100644 --- a/Makefile +++ b/Makefile @@ -213,6 +213,7 @@ clean: rm -f trace.c trace.h trace.c-timestamp trace.h-timestamp rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp rm -f trace-dtrace.h trace-dtrace.h-timestamp + rm -f $(GENERATED_HEADERS) rm -f $(GENERATED_SOURCES) rm -rf $(qapi-dir) $(MAKE) -C tests/tcg clean