david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

Browse Source 
* 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:
Anthony Liguori 2012-01-19 09:23:59 -06:00
commit a75e6678fe
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -168,7 +168,9 @@ qemu-ga$(EXESUF): LIBS = $(LIBS_QGA)
gen-out-type = $(subst .,-,$(suffix $@)) gen-out-type = $(subst .,-,$(suffix $@))
ifneq ($(wildcard config-host.mak),)
include $(SRC_PATH)/tests/Makefile include $(SRC_PATH)/tests/Makefile
endif
$(qapi-dir)/qga-qapi-types.c $(qapi-dir)/qga-qapi-types.h :\ $(qapi-dir)/qga-qapi-types.c $(qapi-dir)/qga-qapi-types.h :\
$(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-types.py $(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.c trace.h trace.c-timestamp trace.h-timestamp
rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp
rm -f trace-dtrace.h trace-dtrace.h-timestamp rm -f trace-dtrace.h trace-dtrace.h-timestamp
rm -f $(GENERATED_HEADERS)
rm -f $(GENERATED_SOURCES) rm -f $(GENERATED_SOURCES)
rm -rf $(qapi-dir) rm -rf $(qapi-dir)
$(MAKE) -C tests/tcg clean $(MAKE) -C tests/tcg clean

2
hw/milkymist-vgafb_template.h
View File

@ -39,7 +39,7 @@
#elif BITS == 24 #elif BITS == 24
#define COPY_PIXEL(to, r, g, b) \ #define COPY_PIXEL(to, r, g, b) \
do { \ do { \
uint32 tmp = rgb_to_pixel24(r, g, b); \ uint32_t tmp = rgb_to_pixel24(r, g, b); \
*(to++) = tmp & 0xff; \ *(to++) = tmp & 0xff; \
*(to++) = (tmp >> 8) & 0xff; \ *(to++) = (tmp >> 8) & 0xff; \
*(to++) = (tmp >> 16) & 0xff; \ *(to++) = (tmp >> 16) & 0xff; \

4
qemu-tool.c
View File

@ -59,12 +59,12 @@ void monitor_protocol_event(MonitorEvent event, QObject *data)
{ {
} }
int64 cpu_get_clock(void) int64_t cpu_get_clock(void)
{ {
abort(); abort();
} }
int64 cpu_get_icount(void) int64_t cpu_get_icount(void)
{ {
abort(); abort();
} }

2
tests/Makefile
View File

@ -36,4 +36,4 @@ test-qmp-commands: test-qmp-commands.o $(qobject-obj-y) $(qapi-obj-y) $(tools-ob
.PHONY: check .PHONY: check
check: $(CHECKS) check: $(CHECKS)
gtester $(CHECKS) $(call quiet-command, gtester $(CHECKS), " CHECK")