Re: [Qemu-devel] [PATCH] exec: move io_mem_read/write to memory.h

[Paolo Bonzini]

Il 13/06/2013 08:59, Michael S. Tsirkin ha scritto:
> implementation is in memory.c, move function
> to match. This allows use from places that
> don't pull in exec-all.h

But they shouldn't be used. :)

Everything except the current users (TCG, and address_space_rw and
friends) should go through exec.c.

Paolo

> Signed-off-by: Michael S. Tsirkin <address@hidden>
> ---
> 
>  include/exec/exec-all.h | 5 -----
>  include/exec/memory.h   | 5 +++++
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
> index 6362074..28cb37d 100644
> --- a/include/exec/exec-all.h
> +++ b/include/exec/exec-all.h
> @@ -367,11 +367,6 @@ bool is_tcg_gen_code(uintptr_t pc_ptr);
>  #if !defined(CONFIG_USER_ONLY)
>  
>  struct MemoryRegion *iotlb_to_region(hwaddr index);
> -uint64_t io_mem_read(struct MemoryRegion *mr, hwaddr addr,
> -                     unsigned size);
> -void io_mem_write(struct MemoryRegion *mr, hwaddr addr,
> -                  uint64_t value, unsigned size);
> -
>  void tlb_fill(CPUArchState *env1, target_ulong addr, int is_write, int 
> mmu_idx,
>                uintptr_t retaddr);
>  
> diff --git a/include/exec/memory.h b/include/exec/memory.h
> index 9e88320..edeb1f2 100644
> --- a/include/exec/memory.h
> +++ b/include/exec/memory.h
> @@ -888,6 +888,11 @@ void address_space_unmap(AddressSpace *as, void *buffer, 
> hwaddr len,
>                           int is_write, hwaddr access_len);
>  
>  
> +uint64_t io_mem_read(struct MemoryRegion *mr, hwaddr addr,
> +                     unsigned size);
> +void io_mem_write(struct MemoryRegion *mr, hwaddr addr,
> +                  uint64_t value, unsigned size);
> +
>  #endif
>  
>  #endif
>