Peter Crosthwaite <crosthwaitepe...@gmail.com> writes: > The monitor currently has one helper, mon_get_cpu() which will return > an env pointer. The target specific users of this API want an env, but > all the target agnostic users really just want the cpu pointer. These > users then need to use the target-specifically defined ENV_GET_CPU to > navigate back up to the CPU from the ENV. Split the API for the two > uses cases to remove all need for ENV_GET_CPU. > > Reviewed-by: Richard Henderson <r...@twiddle.net> > Reviewed-by: Andreas Färber <afaer...@suse.de> > Signed-off-by: Peter Crosthwaite <crosthwaite.pe...@gmail.com> > --- > Changed since v1: > s/mon_get_env/mon_get_cpu_env (Andreas review) > Avoid C99 declaration (RH review)
CC x86_64-softmmu/monitor.o /work/armbru/qemu/monitor.c: In function ‘memory_search’: /work/armbru/qemu/monitor.c:1222:9: warning: passing argument 1 of ‘x86_env_get_cpu’ from incompatible pointer type [enabled by default] } else if (cpu_memory_rw_debug(ENV_GET_CPU(mon_get_cpu()), addr, ^ In file included from /work/armbru/qemu/target-i386/cpu.h:982:0, from /work/armbru/qemu/include/qemu-common.h:124, from /work/armbru/qemu/include/hw/hw.h:5, from /work/armbru/qemu/monitor.c:25: /work/armbru/qemu/target-i386/cpu-qom.h:119:23: note: expected ‘struct CPUX86State *’ but argument is of type ‘struct CPUState *’ static inline X86CPU *x86_env_get_cpu(CPUX86State *env) ^