Re: [Qemu-devel] [RFC v6 0/2] monitor: add memory search commands s, sp

[Claudio Fontana <claudio.fontana@huawei.com>]

On 12.06.2015 08:21, Markus Armbruster wrote:
> Luiz Capitulino <lcapitulino@redhat.com> writes:
> 
>> On Thu, 28 May 2015 16:18:41 -0400
>> Luiz Capitulino <lcapitulino@redhat.com> wrote:
>>
>>> On Mon, 18 May 2015 13:22:16 +0200
>>> hw.claudio@gmail.com wrote:
>>>
>>>> From: Claudio Fontana <claudio.fontana@huawei.com>
>>>>
>>>> This is the latest iteration of the memory search patch,
>>>> including a trivial replacement for the memmem function for systems
>>>> which don't provide one (notably Windows).
>>>>
>>>> It detects the presence of memmem in configure and sets CONFIG_MEMMEM,
>>>> providing a trivial implementation for the !CONFIG_MEMMEM case.
>>>>
>>>> The new code is MIT licensed, following usage of other files in the same
>>>> directory dealing with replacement functions (osdep, oslib, getauxval etc),
>>>> and to maximize reusability.
>>>>
>>>> I have tested this in both CONFIG_MEMMEM defined/undefined scenarios,
>>>> but more feedback and testing is welcome of course.
>>>>
>>>> changes from v5:
>>>> dropped the import from gnulib and implemented a trivial replacement.
>>>>
>>>> changes from v4:
>>>> made into a series of two patches.
>>>> Introduced a memmem replacement function (import from gnulib)
>>>> and detection code in configure.
>>>>
>>>> changes from v3:
>>>> initialize pointer variable to NULL to finally get rid of spurious warning
>>>>
>>>> changes from v2:
>>>> move code to try to address spurious warning
>>>>
>>>> changes from v1:
>>>> make checkpatch happy by adding braces here and there.
>>>>
>>>>
>>>> Claudio Fontana (2):
>>>>   util: add memmem replacement function
>>>>   monitor: add memory search commands s, sp
>>>
>>> Applied to the qmp branch, thanks.
>>
>>
>> Unfortunately, I'm quite busy and won't have time to push this
>> through my tree. Markus is going to pick up this series soon.
>>
>> Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
> 
> This series is marked RFC.  Is it intended for merging anyway?
> 
> Semantic conflict with
> [PATCH v2 0/2] monitor+disas: Remove uses of ENV_GET_CPU
> needs to be resolved:

Hello Markus,

the two series conflict, but the resolution is quite simple.
I would suggest applying the "Remove uses of ENV_GET_CPU" stuff first, and then fixing up my patch, I can do it for you if you need.

Thanks!

Claudio


> 
>   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)
>                        ^
> 


-- 
Claudio Fontana
Server Virtualization Architect
Huawei Technologies Duesseldorf GmbH
Riesstraße 25 - 80992 München