Fix build breakage on ia64

 - Declare 'env' properly as on all other architectures, instead of
   having a local declaration in every object
 - Introduce kvm_arch_try_push_nmi()
 - Remove and cleanup fallout from having stdio.h included in cpu.h

Signed-off-by: Jes Sorensen <jes@sgi.com>
Acked-by : Xiantao zhang <xiantao.zhang@intel.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

4 files changed, 14 insertions, 5 deletions

diff --git a/target-ia64/cpu.h b/target-ia64/cpu.h
index fd00bbb14..ff43d65d3 100644
--- a/target-ia64/cpu.h
+++ b/target-ia64/cpu.h
@@ -26,7 +26,6 @@
 #include "ia64intrin.h"
 
 #include<string.h>
-#include<stdio.h>
 
 #define TARGET_LONG_BITS 64
 
@@ -52,12 +51,9 @@ typedef struct CPUIA64State {
 #define cpu_init cpu_ia64_init
 #define cpu_signal_handler cpu_ia64_signal_handler
 
-struct CPUIA64State *env;
+extern struct CPUIA64State *env;
 int cpu_get_pic_interrupt(CPUIA64State *s);
 int cpu_exec(CPUState *env1);
-void cpu_dump_state(CPUState *env, FILE *f,
-                    int (*cpu_fprintf)(FILE *f, const char *fmt, ...),
-                    int flags);
 CPUState *cpu_ia64_init(const char * cpu_model);
 
 static inline int cpu_mmu_index (CPUState *env)
diff --git a/target-ia64/exec.h b/target-ia64/exec.h
index 7d470560a..0e6b9e86a 100644
--- a/target-ia64/exec.h
+++ b/target-ia64/exec.h
@@ -18,13 +18,21 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#ifndef __IA64_H__
+#define __IA64_H__
+
 //#include "dyngen-exec.h"
+#include "config.h"
+
+#include "dyngen-exec.h"
 
 #include "cpu.h"
 #include "exec-all.h"
 
 #define tcg_qemu_tb_exec(tb_ptr) 0
 
+register struct CPUIA64State *env asm(AREG0);
+
 static inline void env_to_regs(void)
 {
 }
@@ -45,3 +53,5 @@ static inline int cpu_halted(CPUState *env) {
         return 0;
     return EXCP_HALTED;
 }
+
+#endif
diff --git a/target-ia64/fake-exec.c b/target-ia64/fake-exec.c
index de81381db..c11cc3221 100644
--- a/target-ia64/fake-exec.c
+++ b/target-ia64/fake-exec.c
@@ -14,6 +14,8 @@
  * This work is licensed under the GNU GPL licence version 2 or later.
  *
  */
+#include <stdio.h>
+
 #include "cpu.h"
 #include "exec-all.h"
 
diff --git a/target-ia64/firmware.c b/target-ia64/firmware.c
index c5e4fa9c5..bac2721f2 100644
--- a/target-ia64/firmware.c
+++ b/target-ia64/firmware.c
@@ -21,6 +21,7 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <zlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>