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
This commit is contained in:
commit
a75e6678fe
3
Makefile
3
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
|
||||
|
@ -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
|
||||
|
|
|
@ -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; \
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
|
|
@ -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")
|
||||
|
|
Loading…
Reference in a new issue