Merge remote branch 'qmp/for-anthony' into staging

diff --combined Makefile
index a1434b1bd9881f97e2e6093e704b19bcca834490,106a4015a802989dfff654ef39517cff3023f85f..3df202c26f14d8b9906c61d732bb25e911326888
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -129,23 -129,23 +129,23 @@@ version-obj-$(CONFIG_WIN32) += version.
  qemu-img.o: qemu-img-cmds.h
  qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o: $(GENERATED_HEADERS)
  
 -qemu-img$(EXESUF): qemu-img.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y)
 +qemu-img$(EXESUF): qemu-img.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-timer-common.o
  
 -qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y)
 +qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-timer-common.o
  
 -qemu-io$(EXESUF): qemu-io.o cmd.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y)
 +qemu-io$(EXESUF): qemu-io.o cmd.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-timer-common.o
  
  qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
        $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@,"  GEN   $@")
  
  check-qint.o check-qstring.o check-qdict.o check-qlist.o check-qfloat.o check-qjson.o: $(GENERATED_HEADERS)
  
- check-qint: check-qint.o qint.o qemu-malloc.o
- check-qstring: check-qstring.o qstring.o qemu-malloc.o
- check-qdict: check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qemu-malloc.o qlist.o
- check-qlist: check-qlist.o qlist.o qint.o qemu-malloc.o
- check-qfloat: check-qfloat.o qfloat.o qemu-malloc.o
- check-qjson: check-qjson.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o qjson.o json-streamer.o json-lexer.o json-parser.o qemu-malloc.o
+ check-qint: check-qint.o qint.o qemu-malloc.o $(trace-obj-y)
+ check-qstring: check-qstring.o qstring.o qemu-malloc.o $(trace-obj-y)
+ check-qdict: check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qemu-malloc.o qlist.o $(trace-obj-y)
+ check-qlist: check-qlist.o qlist.o qint.o qemu-malloc.o $(trace-obj-y)
+ check-qfloat: check-qfloat.o qfloat.o qemu-malloc.o $(trace-obj-y)
+ check-qjson: check-qjson.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o qjson.o json-streamer.o json-lexer.o json-parser.o qemu-malloc.o $(trace-obj-y)
  
  clean:
  # avoid old build problems by removing potentially incorrect old files