Re: [Qemu-devel] [PATCH v1 20/22] exec: Make cpu_memory_rw_debug use the CPUs AS

[Andreas Färber]

Am 16.12.2013 09:06, schrieb address@hidden:
> From: "Edgar E. Iglesias" <address@hidden>
> 
> Signed-off-by: Edgar E. Iglesias <address@hidden>
> ---
>  exec.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/exec.c b/exec.c
> index 686f0d1..e672824 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -2669,6 +2669,7 @@ int cpu_memory_rw_debug(CPUState *cpu, target_ulong 
> addr,
>      int l;
>      hwaddr phys_addr;
>      target_ulong page;
> +    CPUArchState *env = cpu->env_ptr;
>  
>      while (len > 0) {
>          page = addr & TARGET_PAGE_MASK;
> @@ -2681,10 +2682,9 @@ int cpu_memory_rw_debug(CPUState *cpu, target_ulong 
> addr,
>              l = len;
>          phys_addr += (addr & ~TARGET_PAGE_MASK);
>          if (is_write)
> -            cpu_physical_memory_write_rom(&address_space_memory,
> -                                          phys_addr, buf, l);
> +            cpu_physical_memory_write_rom(env->as, phys_addr, buf, l);
>          else
> -            cpu_physical_memory_rw(phys_addr, buf, l, is_write);
> +            address_space_rw(env->as, phys_addr, buf, l, 0);

Add braces for if and else while at it? :)

Andreas

>          len -= l;
>          buf += l;
>          addr += l;

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg