Merge remote-tracking branch 'qmp/queue/qmp' into staging

diff --cc Makefile
Simple merge

diff --cc Makefile.objs
Simple merge

diff --cc Makefile.target
Simple merge

diff --cc gdbstub.c
Simple merge

diff --cc hmp-commands.hx
Simple merge

diff --cc monitor.c
index da13471,c226879..31b212a
--- 1/monitor.c
--- 2/monitor.c
+++ b/monitor.c
@@@ -62,8 -61,11 +62,10 @@@
  #ifdef CONFIG_TRACE_SIMPLE
  #include "trace/simple.h"
  #endif
 -#include "trace/control.h"
  #include "ui/qemu-spice.h"
  #include "memory.h"
+ #include "qmp-commands.h"
+ #include "hmp.h"
  
  //#define DEBUG
  //#define DEBUG_COMPLETION