diff options
| author |   Zhang, Yang <yang.zhang@intel.com> | 2009-03-03 12:03:49 +0800 |
|---|---|---|
| committer |   Avi Kivity <avi@redhat.com> | 2009-03-08 16:49:32 +0200 |
| commit | 1496282adf1c705fd9b87360dbfb80416307bf49 (patch) | |
| tree | c67118d037660a6c98961987a611cd3cb61c009e /target-ia64 | |
| parent | kvm: external module: add support for new file timer.c (diff) | |
| download | qemu-kvm-1496282adf1c705fd9b87360dbfb80416307bf49.tar.gz qemu-kvm-1496282adf1c705fd9b87360dbfb80416307bf49.tar.bz2 qemu-kvm-1496282adf1c705fd9b87360dbfb80416307bf49.zip | |
Fix warnings in ia64
clean up the warning info in the ia64's code
Signed-off-by: Yang Zhang <yang.zhang@intel.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'target-ia64')
| -rw-r--r-- | target-ia64/exec.h | 1 | ||||
| -rw-r--r-- | target-ia64/firmware.c | 3 | ||||
| -rw-r--r-- | target-ia64/firmware.h | 2 | ||||
| -rw-r--r-- | target-ia64/op_helper.c | 6 |
4 files changed, 9 insertions, 3 deletions
diff --git a/target-ia64/exec.h b/target-ia64/exec.h index 0e6b9e86a..37b64f716 100644 --- a/target-ia64/exec.h +++ b/target-ia64/exec.h @@ -45,7 +45,6 @@ void do_interrupt (CPUState *env); void cpu_lock(void); void cpu_unlock(void); -void cpu_loop_exit(void); static inline int cpu_halted(CPUState *env) { /* handle exit of HALTED state */ diff --git a/target-ia64/firmware.c b/target-ia64/firmware.c index 88fcaa874..87a817881 100644 --- a/target-ia64/firmware.c +++ b/target-ia64/firmware.c @@ -649,7 +649,8 @@ kvm_ia64_copy_from_nvram_to_GFW(unsigned long nvram_fd, struct stat file_stat; if ((fstat(nvram_fd, &file_stat) < 0) || (NVRAM_SIZE != file_stat.st_size) || - (read(nvram_fd, fw_start + NVRAM_OFFSET, NVRAM_SIZE) != NVRAM_SIZE)) + (read(nvram_fd, (void *)(fw_start + NVRAM_OFFSET), + NVRAM_SIZE) != NVRAM_SIZE)) return -1; return 0; } diff --git a/target-ia64/firmware.h b/target-ia64/firmware.h index 47aaa1d8b..c1707ac8d 100644 --- a/target-ia64/firmware.h +++ b/target-ia64/firmware.h @@ -57,7 +57,7 @@ extern int kvm_ia64_build_hob(unsigned long memsize, unsigned long vcpus, uint8_t *fw_start, unsigned long nvram_addr); extern char *read_image(const char *filename, unsigned long *size); -extern int kvm_ia64_copy_from_GFW_to_nvram(); +extern int kvm_ia64_copy_from_GFW_to_nvram(void); extern int kvm_ia64_nvram_init(unsigned long type); extern int kvm_ia64_copy_from_nvram_to_GFW(unsigned long nvram_fd, const uint8_t *fw_start); diff --git a/target-ia64/op_helper.c b/target-ia64/op_helper.c index 78b32f962..d51525ac4 100644 --- a/target-ia64/op_helper.c +++ b/target-ia64/op_helper.c @@ -27,6 +27,12 @@ #include "qemu-kvm.h" #include "qemu-common.h" +void cpu_ia64_set_model(CPUIA64State *env, uint32_t id); +void cpu_ia64_close(CPUIA64State *env); +void switch_mode(CPUState *env, int mode); +void do_interrupt(CPUIA64State *env); +int cpu_ia64_handle_mmu_fault (CPUState *env, target_ulong address, + int access_type, int is_user, int is_softmmu); CPUState *cpu_ia64_init(const char *cpu_model) { CPUState *env; |