Re: [Qemu-devel] segfault on current HEAD, qemu-system-arm

[Blue Swirl]

On Wed, Oct 5, 2011 at 1:22 PM, Peter Maydell <address@hidden> wrote:
> On 2 October 2011 19:44, Blue Swirl <address@hidden> wrote:
>> Bah, bug in bccd9ec5f098668576342c83d90d6d6833d61d33,
>> target-arm/op_helper.c missed this change unlike all other targets:
>> diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
>> index ab9c923..1892b35 100644
>> --- a/target-arm/op_helper.c
>> +++ b/target-arm/op_helper.c
>> @@ -84,6 +84,7 @@ void tlb_fill(CPUState *env1, target_ulong addr, int
>> is_write, int mmu_idx,
>>     int ret;
>>
>>     saved_env = env;
>> +    env = env1;
>>     ret = cpu_arm_handle_mmu_fault(env, addr, is_write, mmu_idx);
>>     if (unlikely(ret)) {
>>         if (retaddr) {
>>
>
> This fixes the segfault for me.
>
> Reviewed-by: Peter Maydell <address@hidden>

Thanks for the review, applied.