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

diff --cc Makefile
Simple merge

diff --cc Makefile.target
Simple merge

diff --cc monitor.c
Simple merge

diff --cc monitor.h
Simple merge

diff --cc qjson.h
index 70d0afba54f8b150f81575e8833b6b4c0ec11ed6,cd60e0bbe57937c0e714bd04724f0eace6b6b309..65b10ea369e5e54447b781903ea258511593b1ed
--- 1/qjson.h
--- 2/qjson.h
+++ b/qjson.h
@@@ -18,10 -18,12 +18,11 @@@
  #include "qobject.h"
  #include "qstring.h"
  
 -QObject *qobject_from_json(const char *string);
 -QObject *qobject_from_jsonf(const char *string, ...)
 -    __attribute__((__format__ (__printf__, 1, 2)));
 -QObject *qobject_from_jsonv(const char *string, va_list *ap);
 +QObject *qobject_from_json(const char *string) GCC_FMT_ATTR(1, 0);
 +QObject *qobject_from_jsonf(const char *string, ...) GCC_FMT_ATTR(1, 2);
 +QObject *qobject_from_jsonv(const char *string, va_list *ap) GCC_FMT_ATTR(1, 0);
  
  QString *qobject_to_json(const QObject *obj);
+ QString *qobject_to_json_pretty(const QObject *obj);
  
  #endif /* QJSON_H */