Received: from eggs.gnu.org ([2001:4830:134:3::10]:55110) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3KEd-0001pO-NM for qemu-devel@nongnu.org; Fri, 12 Jun 2015 04:22:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z3KEa-0001Cn-42 for qemu-devel@nongnu.org; Fri, 12 Jun 2015 04:22:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58993) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3KEZ-0001CZ-UK for qemu-devel@nongnu.org; Fri, 12 Jun 2015 04:22:40 -0400 From: Markus Armbruster References: <87zj455uk1.fsf@blackfin.pond.sub.org> Date: Fri, 12 Jun 2015 08:14:43 +0200 In-Reply-To: <87zj455uk1.fsf@blackfin.pond.sub.org> (Markus Armbruster's message of "Fri, 12 Jun 2015 08:07:10 +0200") Message-ID: <87wpz94fn0.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 1/2] monitor: Split mon_get_cpu fn to remove ENV_GET_CPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Crosthwaite Cc: rth@twiddle.net, lcapitulino@redhat.com, qemu-devel@nongnu.org, afaerber@suse.de, Peter Crosthwaite Markus Armbruster writes: > Peter Crosthwaite 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 >> Reviewed-by: Andreas F=C3=A4rber >> Signed-off-by: Peter Crosthwaite >> --- >> 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 =E2=80=98memory_search=E2=80=99: > /work/armbru/qemu/monitor.c:1222:9: warning: passing argument 1 of =E2=80= =98x86_env_get_cpu=E2=80=99 from incompatible pointer type [enabled by defa= ult] > } 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 =E2=80=98s= truct CPUX86State *=E2=80=99 but argument is of type =E2=80=98struct CPUSta= te *=E2=80=99 > static inline X86CPU *x86_env_get_cpu(CPUX86State *env) > ^ Semantic conflict with [RFC v6 0/2] monitor: add memory search commands s, sp Since that series is marked RFC, I'm picking up yours, and will ask Claudio to rebase.