diff options
| author |   Xiantao Zhang <xiantao.zhang@intel.com> | 2008-07-11 09:14:23 +0800 |
|---|---|---|
| committer |   Avi Kivity <avi@qumranet.com> | 2008-07-13 13:26:35 +0300 |
| commit | f2d88bcd784186a8b898ed56c2f1be50cc601763 (patch) | |
| tree | ffabfd98e8525e7f86ee0a212d103e5f06f37e0c /target-ia64 | |
| parent | Force screen resize if a display buffer does not exist (diff) | |
| download | qemu-kvm-f2d88bcd784186a8b898ed56c2f1be50cc601763.tar.gz qemu-kvm-f2d88bcd784186a8b898ed56c2f1be50cc601763.tar.bz2 qemu-kvm-f2d88bcd784186a8b898ed56c2f1be50cc601763.zip | |
Fix ia64 build issue caused by last qemu merge
Fix ia64 build issue due to latest merge with upstream.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'target-ia64')
| -rw-r--r-- | target-ia64/cpu.h | 5 | ||||
| -rw-r--r-- | target-ia64/fake-exec.c | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/target-ia64/cpu.h b/target-ia64/cpu.h index 12718f5b4..a3ff7a87b 100644 --- a/target-ia64/cpu.h +++ b/target-ia64/cpu.h @@ -42,10 +42,7 @@ #include "softfloat.h" typedef struct CPUIA64State { - CPU_COMMON; - - int interrupt_request; - int user_mode_only; + CPU_COMMON; uint32_t hflags; } CPUIA64State; diff --git a/target-ia64/fake-exec.c b/target-ia64/fake-exec.c index b6bd2cfc3..de81381db 100644 --- a/target-ia64/fake-exec.c +++ b/target-ia64/fake-exec.c @@ -14,8 +14,8 @@ * This work is licensed under the GNU GPL licence version 2 or later. * */ -#include "exec.h" #include "cpu.h" +#include "exec-all.h" int code_copy_enabled = 0; @@ -48,3 +48,10 @@ void flush_icache_range(unsigned long start, unsigned long stop) asm volatile (";;sync.i;;srlz.i;;"); } +int cpu_restore_state(TranslationBlock *tb, + CPUState *env, unsigned long searched_pc, + void *puc) + +{ + return 0; +} |