diff options
| author |   Zhang Xiantao <xiantao.zhang@intel.com> | 2007-12-21 22:47:52 +0800 |
|---|---|---|
| committer |   Avi Kivity <avi@qumranet.com> | 2007-12-22 22:15:09 +0200 |
| commit | f76c540e65b8e6cd0dee55b3d851bde17d03e900 (patch) | |
| tree | cd6de58cf3622742daf2927fcb83bd498b88a75b /target-ia64 | |
| parent | Re-add missing declarations for qemu_get_launch_info (diff) | |
| download | qemu-kvm-f76c540e65b8e6cd0dee55b3d851bde17d03e900.tar.gz qemu-kvm-f76c540e65b8e6cd0dee55b3d851bde17d03e900.tar.bz2 qemu-kvm-f76c540e65b8e6cd0dee55b3d851bde17d03e900.zip | |
Fix ia64 build on latest source
Due to last merge with qemu upstream, ia64 build
is broken. This patch fix it.
Signed-off-by: Zhang Xiantao <xiantao.zhang@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'target-ia64')
| -rw-r--r-- | target-ia64/cpu.h | 10 | ||||
| -rw-r--r-- | target-ia64/firmware.c | 1 | ||||
| -rw-r--r-- | target-ia64/op_helper.c | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/target-ia64/cpu.h b/target-ia64/cpu.h index be409c7b9..2d91cb9bc 100644 --- a/target-ia64/cpu.h +++ b/target-ia64/cpu.h @@ -30,11 +30,11 @@ #define TARGET_LONG_BITS 64 - -#define TARGET_PAGE_BITS 14 +#define TARGET_PAGE_BITS 16 #define ELF_MACHINE EM_IA_64 +#define NB_MMU_MODES 2 #define CPU_PAL_HALT 1 #define HF_HALTED_MASK (1 << CPU_PAL_HALT) @@ -69,7 +69,11 @@ void cpu_dump_state(CPUState *env, FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...), int flags); -CPUState *cpu_ia64_init(void); +CPUState *cpu_ia64_init(char * cpu_model); +static inline int cpu_mmu_index (CPUState *env) +{ + return 0; +} #include "cpu-all.h" diff --git a/target-ia64/firmware.c b/target-ia64/firmware.c index 24693504e..51650c884 100644 --- a/target-ia64/firmware.c +++ b/target-ia64/firmware.c @@ -253,7 +253,6 @@ load_hob(void *hob_buf, return 0; } -#define MIN(x, y) ((x) < (y)) ? (x) : (y) static int add_mem_hob(void* hob_buf, unsigned long dom_mem_size) { diff --git a/target-ia64/op_helper.c b/target-ia64/op_helper.c index 1b8226a64..5138af502 100644 --- a/target-ia64/op_helper.c +++ b/target-ia64/op_helper.c @@ -26,7 +26,7 @@ extern int kvm_allowed; -CPUState *cpu_ia64_init(void){ +CPUState *cpu_ia64_init(char *cpu_model){ CPUState *env; env = qemu_mallocz(sizeof(CPUState)); if (!env) |