From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 10 Oct 2011 13:21:46 +0000 (-0500)
Subject: Merge remote-tracking branch 'qmp/queue/qmp' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ebffe2afceb1a17b5d134b5debf553955fe5ea1a;p=qemu.git

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

ebffe2afceb1a17b5d134b5debf553955fe5ea1a
diff --cc monitor.c
index da1347160c,c22687924f..31b212aa6b
--- a/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