Hello Markus,
the merge conflict resolution is the following:
-----
diff --git a/monitor.c b/monitor.c
index 4a5ac4e..fc6e15b 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1219,7 +1219,7 @@ static void memory_search(Monitor *mon, int
count, int format, int wsize,
}
if (is_physical) {
cpu_physical_memory_read(addr, hay, l);
- } else if (cpu_memory_rw_debug(ENV_GET_CPU(mon_get_cpu()), addr,
+ } else if (cpu_memory_rw_debug(mon_get_cpu(), addr,
(uint8_t *)hay, l, 0) < 0) {
monitor_printf(mon, " Cannot access memory\n");
break;
-----
You can also fetch this from the following repo and branch:
https://github.com/hw-claudio/qemu-aarch64-queue "memsearch_merge_conflict"
Or do you want me to respin based on an uncommited state of master +
"remove ENV_GET_CPU" series?
Thanks,
Claudio
On 12 June 2015 at 14:57, Markus Armbruster <arm...@redhat.com> wrote:
> Claudio Fontana <claudio.font...@huawei.com> writes:
>
>> On 12.06.2015 08:21, Markus Armbruster wrote:
>>> 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.
>
> Please do, and make sure to drop the RFC on your respin if you want it
> merged.
