[PATCH] make qemu compile for kvm/ia64

[Xu, Anthony]

>From 7b2c2612b21b895cd14e632fea845c03b6e1dedc Mon Sep 17 00:00:00 2001
From: Anthony Xu  <[EMAIL PROTECTED]>
Date: Thu, 29 May 2008 13:14:56 -0400
Subject: [PATCH] Make qemu compile for kvm-ia64

Since merging with Qemu upsteram, it can't be compiled
for kvm-ia64

Signed-off-by: Anthony Xu < [EMAIL PROTECTED] >
---
 qemu/Makefile.target   |    8 +++++++-
 qemu/cpu-exec.c        |    5 +++++
 qemu/exec.c            |    4 ++++
 qemu/target-ia64/cpu.h |    3 ---
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/qemu/Makefile.target b/qemu/Makefile.target
index ac5eda1..a1491d0 100644
--- a/qemu/Makefile.target
+++ b/qemu/Makefile.target
@@ -201,8 +201,10 @@ ifdef CONFIG_DYNGEN_OP
 LIBOBJS+=op.o
 endif
 # TCG code generator
+ifneq ($(TARGET_ARCH), ia64)
 LIBOBJS+= tcg/tcg.o tcg/tcg-dyngen.o tcg/tcg-runtime.o
 CPPFLAGS+=-I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/$(ARCH)
+endif
 ifeq ($(ARCH),sparc64)
 CPPFLAGS+=-I$(SRC_PATH)/tcg/sparc
 endif
@@ -239,7 +241,11 @@ LIBOBJS+= qemu-kvm-powerpc.o
 endif
 endif
 
-LIBOBJS+= op_helper.o helper.o
+LIBOBJS+= op_helper.o 
+
+ifneq ($(TARGET_ARCH), ia64)
+LIBOBJS+= helper.o
+endif
 
 ifeq ($(TARGET_BASE_ARCH), arm)
 LIBOBJS+= neon_helper.o iwmmxt_helper.o
diff --git a/qemu/cpu-exec.c b/qemu/cpu-exec.c
index 252927f..b61e9aa 100644
--- a/qemu/cpu-exec.c
+++ b/qemu/cpu-exec.c
@@ -21,7 +21,9 @@
 #define CPU_NO_GLOBAL_REGS
 #include "exec.h"
 #include "disas.h"
+#if !defined(TARGET_IA64)
 #include "tcg.h"
+#endif
 
 #if !defined(CONFIG_SOFTMMU)
 #undef EAX
@@ -620,7 +622,10 @@ int cpu_exec(CPUState *env1)
                 env = cpu_single_env;
 #define env cpu_single_env
 #endif
+
+#if !defined(TARGET_IA64)
                 next_tb = tcg_qemu_tb_exec(tc_ptr);
+#endif
                 env->current_tb = NULL;
                 /* reset soft MMU for next block (it can currently
                    only be set by a memory fault) */
diff --git a/qemu/exec.c b/qemu/exec.c
index 37a956b..3dd49b5 100644
--- a/qemu/exec.c
+++ b/qemu/exec.c
@@ -37,7 +37,9 @@
 #include "exec-all.h"
 #include "qemu-common.h"
 
+#if !defined(TARGET_IA64)
 #include "tcg.h"
+#endif
 #include "qemu-kvm.h"
 
 #if defined(CONFIG_USER_ONLY)
@@ -3197,7 +3199,9 @@ void dump_exec_info(FILE *f,
     cpu_fprintf(f, "TB flush count      %d\n", tb_flush_count);
     cpu_fprintf(f, "TB invalidate count %d\n",
tb_phys_invalidate_count);
     cpu_fprintf(f, "TLB flush count     %d\n", tlb_flush_count);
+#if !defined(TARGET_IA64)
     tcg_dump_info(f, cpu_fprintf);
+#endif
 }
 
 #if !defined(CONFIG_USER_ONLY)
diff --git a/qemu/target-ia64/cpu.h b/qemu/target-ia64/cpu.h
index f8e5e8a..12718f5 100644
--- a/qemu/target-ia64/cpu.h
+++ b/qemu/target-ia64/cpu.h
@@ -43,9 +43,6 @@
 #include "softfloat.h"
 typedef struct CPUIA64State {
     CPU_COMMON;
-    /* exception/interrupt handling */
-   jmp_buf jmp_env;
-   int exception_index;
 
    int interrupt_request;
    int user_mode_only;
-- 
1.5.5

0001-Make-qemu-compile-for-kvm-ia64.patch
Description: 0001-Make-qemu-compile-for-kvm-ia64.patch