[Qemu-devel] [PATCH] Fix cpu_arm_handle_mmu_fault warning

[Qemu-devel] [PATCH] Fix cpu_arm_handle_mmu_fault warning

[Nathan Froyd]

This patch fixes:

/scratch/froydnj/qemu.git/target-arm/helper.c:451: warning: no previous prototype for 'cpu_arm_handle_mmu_fault'

by moving the declaration of the function to cpu.h from exec.h.  cpu.h
seems to be the place most other ports declare the corresponding
function.

Signed-off-by: Nathan Froyd <froydnj@codesourcery.com>
---
 target-arm/cpu.h  |    2 ++
 target-arm/exec.h |    3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index 54c2c2e..cab80cd 100644
--- a/target-arm/cpu.h
+++ b/target-arm/cpu.h
@@ -217,6 +217,8 @@ uint32_t do_arm_semihosting(CPUARMState *env);
    is returned if the signal was handled by the virtual CPU.  */
 int cpu_arm_signal_handler(int host_signum, void *pinfo,
                            void *puc);
+int cpu_arm_handle_mmu_fault (CPUARMState *env, target_ulong address, int rw,
+                              int mmu_idx, int is_softmuu);
 
 void cpu_lock(void);
 void cpu_unlock(void);
diff --git a/target-arm/exec.h b/target-arm/exec.h
index b70e0cb..3e4083a 100644
--- a/target-arm/exec.h
+++ b/target-arm/exec.h
@@ -37,9 +37,6 @@ static inline void regs_to_env(void)
 {
 }
 
-int cpu_arm_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
-                              int mmu_idx, int is_softmmu);
-
 static inline int cpu_halted(CPUState *env) {
     if (!env->halted)
         return 0;
-- 
1.6.0.5

Re: [Qemu-devel] [PATCH] Fix cpu_arm_handle_mmu_fault warning

[Aurelien Jarno]

On Mon, Jan 26, 2009 at 05:56:11PM -0800, Nathan Froyd wrote:
> This patch fixes:
> 
> /scratch/froydnj/qemu.git/target-arm/helper.c:451: warning: no previous prototype for 'cpu_arm_handle_mmu_fault'
> 
> by moving the declaration of the function to cpu.h from exec.h.  cpu.h
> seems to be the place most other ports declare the corresponding
> function.
> 
> ---
>  target-arm/cpu.h  |    2 ++
>  target-arm/exec.h |    3 ---
>  2 files changed, 2 insertions(+), 3 deletions(-)

Thanks, applied.

> diff --git a/target-arm/cpu.h b/target-arm/cpu.h
> index 54c2c2e..cab80cd 100644
> --- a/target-arm/cpu.h
> +++ b/target-arm/cpu.h
> @@ -217,6 +217,8 @@ uint32_t do_arm_semihosting(CPUARMState *env);
>     is returned if the signal was handled by the virtual CPU.  */
>  int cpu_arm_signal_handler(int host_signum, void *pinfo,
>                             void *puc);
> +int cpu_arm_handle_mmu_fault (CPUARMState *env, target_ulong address, int rw,
> +                              int mmu_idx, int is_softmuu);
>  
>  void cpu_lock(void);
>  void cpu_unlock(void);
> diff --git a/target-arm/exec.h b/target-arm/exec.h
> index b70e0cb..3e4083a 100644
> --- a/target-arm/exec.h
> +++ b/target-arm/exec.h
> @@ -37,9 +37,6 @@ static inline void regs_to_env(void)
>  {
>  }
>  
> -int cpu_arm_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
> -                              int mmu_idx, int is_softmmu);
> -
>  static inline int cpu_halted(CPUState *env) {
>      if (!env->halted)
>          return 0;
> -- 
> 1.6.0.5
> 
> 
> 
> 

-- 
Aurelien Jarno	                        GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net