diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-19 09:23:59 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-19 09:23:59 -0600 |
| commit | a75e6678fe095147c7343ec9d0e772ae640f0e7a (patch) | |
| tree | ad88b97ec2cf01dcf47628e0fa1851636b289c92 | |
| parent | b48c0134de96f3deed15a0e115d58f3cff09f3c1 (diff) | |
| parent | dcfa486817c12ea41165265cfaaa236d11968626 (diff) | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches:
Makefile: Remove generated headers on clean
Makefile: Exclude tests/Makefile in unconfigured tree
lm32: Fix mixup of uint32 and uint32_t
tests: Silence gtester in Makefile
qemu-tool: Fix mixup of int64 and int64_t
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | hw/milkymist-vgafb_template.h | 2 | ||||
| -rw-r--r-- | qemu-tool.c | 4 | ||||
| -rw-r--r-- | tests/Makefile | 2 |
4 files changed, 7 insertions, 4 deletions
@@ -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 @@ -211,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 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; \ 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(); } 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") |