From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jes Sorensen Subject: [patch] qemu fix missing prototypes on ia64 and minor cleanups Date: Thu, 04 Sep 2008 17:40:09 +0200 Message-ID: <48C00159.3030903@sgi.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------000800060602060407010906" To: Avi Kivity , kvm@vger.kernel.org, kvm-ia64@vger.kernel.org Return-path: Received: from relay1.sgi.com ([192.48.171.29]:36544 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751340AbYIDPkN (ORCPT ); Thu, 4 Sep 2008 11:40:13 -0400 Sender: kvm-owner@vger.kernel.org List-ID: This is a multi-part message in MIME format. --------------000800060602060407010906 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi, This one kills a few missing prototype warnings during compile time on ia64. These are always risky given that the Linux ia64 text and data segments are outside the 32bit window.... cheers, Jes --------------000800060602060407010906 Content-Type: text/plain; name="0100-ia64-missing-protos.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0100-ia64-missing-protos.patch" Add missing prototypes to the ia64 header files. Remove unused variables T0/T1/T2 declared in exec.h and fix a small formatting issue to match the formatting style of qemu. Add 'const' to cpu_ia64_init() to match the rest of qemu. Signed-off-by: Jes Sorensen --- qemu/target-ia64/cpu.h | 18 ++++++++++++++---- qemu/target-ia64/exec.h | 6 +----- qemu/target-ia64/op_helper.c | 2 +- 3 files changed, 16 insertions(+), 10 deletions(-) Index: kvm-userspace.git/qemu/target-ia64/cpu.h =================================================================== --- kvm-userspace.git.orig/qemu/target-ia64/cpu.h +++ kvm-userspace.git/qemu/target-ia64/cpu.h @@ -42,9 +42,9 @@ #include "softfloat.h" typedef struct CPUIA64State { - CPU_COMMON; - uint32_t hflags; - int mp_state; + CPU_COMMON; + uint32_t hflags; + int mp_state; } CPUIA64State; #define CPUState CPUIA64State @@ -58,13 +58,23 @@ 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); -CPUState *cpu_ia64_init(char * cpu_model); static inline int cpu_mmu_index (CPUState *env) { return 0; } +#define CPU_PC_FROM_TB(env, tb) do{}while(0) + #include "cpu-all.h" +/* + * These ones really should go to the appropriate tcg header file, if/when + * tcg support is added for ia64. + */ +void flush_icache_range(unsigned long start, unsigned long stop); +void tcg_dump_info(FILE *f, + int (*cpu_fprintf)(FILE *f, const char *fmt, ...)); + #endif Index: kvm-userspace.git/qemu/target-ia64/exec.h =================================================================== --- kvm-userspace.git.orig/qemu/target-ia64/exec.h +++ kvm-userspace.git/qemu/target-ia64/exec.h @@ -22,9 +22,6 @@ #include "cpu.h" #include "exec-all.h" -uint32_t T0; -uint32_t T1; -uint32_t T2; #define tcg_qemu_tb_exec(tb_ptr) 0 @@ -36,8 +33,7 @@ { } -void tcg_dump_info(FILE *f, - int (*cpu_fprintf)(FILE *f, const char *fmt, ...)); +void do_interrupt (CPUState *env); void cpu_lock(void); void cpu_unlock(void); Index: kvm-userspace.git/qemu/target-ia64/op_helper.c =================================================================== --- kvm-userspace.git.orig/qemu/target-ia64/op_helper.c +++ kvm-userspace.git/qemu/target-ia64/op_helper.c @@ -27,7 +27,7 @@ #include "qemu-kvm.h" #include "qemu-common.h" -CPUState *cpu_ia64_init(char *cpu_model){ +CPUState *cpu_ia64_init(const char *cpu_model){ CPUState *env; env = qemu_mallocz(sizeof(CPUState)); if (!env) --------------000800060602060407010906--