Merge remote-tracking branch 'remotes/stsquad/tags/pull-travis-10022017-1' into staging

[qemu.git] / include / disas / disas.h

diff --git a/include/disas/disas.h b/include/disas/disas.h
index c13ca9a3a4dd1cf86bb029183dc60027c1fbf5ff..e549ca24a1523ae4f8a4917a89c12096fc505f53 100644 (file)
--- a/include/disas/disas.h
+++ b/include/disas/disas.h
@@ -1,15 +1,17 @@
-#ifndef _QEMU_DISAS_H
-#define _QEMU_DISAS_H
+#ifndef QEMU_DISAS_H
+#define QEMU_DISAS_H
 
 #include "qemu-common.h"
 
 #ifdef NEED_CPU_H
+#include "cpu.h"
+
 /* Disassemble this for me please... (debugging). */
 void disas(FILE *out, void *code, unsigned long size);
-void target_disas(FILE *out, CPUArchState *env, target_ulong code,
+void target_disas(FILE *out, CPUState *cpu, target_ulong code,
                   target_ulong size, int flags);
 
-void monitor_disas(Monitor *mon, CPUArchState *env,
+void monitor_disas(Monitor *mon, CPUState *cpu,
                    target_ulong pc, int nb_insn, int is_physical, int flags);
 
 /* Look up symbol for debugging purpose.  Returns "" if unknown. */
@@ -40,4 +42,4 @@ struct syminfo {
 /* Filled in by elfload.c.  Simplistic, but will do for now. */
 extern struct syminfo *syminfos;
 
-#endif /* _QEMU_DISAS_H */
+#endif /* QEMU_DISAS_H */