path: root/hmp.c
diff options
authorAnthony Liguori <aliguori@us.ibm.com>2013-04-15 17:06:04 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2013-04-15 17:06:04 -0500
commit4ceb193d30fe9b1cda0dc73bddb8051659926fb9 (patch)
treea9ffbe92293ba9b0cc3298591e7564aae19a0ef1 /hmp.c
parenta907cf59d8a41ecb909ad4367cd016c7d71f8546 (diff)
parentc72dd2d04bd28f7ec6b073316270258684ba5fc3 (diff)
Merge remote-tracking branch 'bonzini/hw-dirs' into staging
* bonzini/hw-dirs: exec: remove useless declarations from memory-internal.h memory: move core typedefs to qemu/typedefs.h include: avoid useless includes of exec/ headers sysemu: avoid proliferation of include/ subdirectories tpm: reorganize headers and split hardware part configure: fix TPM logic acpi.h: make it self contained acpi: move declarations from pc.h to acpi.h hw: Add lost ARM core again Fix failure to create q35 machine Add linux-headers to QEMU_INCLUDES arm: fix location of some include files Conflicts: configure aliguori: trivial conflict in configure output Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hmp.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/hmp.c b/hmp.c
index 2e35b3da4e..4fb76ec7a7 100644
--- a/hmp.c
+++ b/hmp.c
@@ -15,7 +15,7 @@
#include "hmp.h"
#include "net/net.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/option.h"
#include "qemu/timer.h"
#include "qmp-commands.h"