Re: [Qemu-devel] [PATCH 3/5] target-i386: call x86_cpu_realize() after APIC is initialized.

[Igor Mammedov <imammedo@redhat.com>]

On 06/21/2012 12:14 PM, Andreas Färber wrote:
> Am 21.06.2012 11:43, schrieb Igor Mammedov:
>> On 06/20/2012 03:35 PM, Andreas Färber wrote:
>>> Am 20.06.2012 14:59, schrieb Igor Mammedov:
>>>> It's not correct to make CPU runnable (i.e. calling x86_cpu_realize())
>>>> when not all properties are set (APIC in this case).
>>>>
>>>> Fix it by calling x86_cpu_realize() at board level after APIC is
>>>> initialized, right before cpu_reset().
>>>>
>>>> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>>>> ---
>>>>    hw/pc.c              |    1 +
>>>>    target-i386/helper.c |    2 --
>>>>    2 files changed, 1 insertion(+), 2 deletions(-)
>>>>
>>>> diff --git a/hw/pc.c b/hw/pc.c
>>>> index 8368701..8a662cf 100644
>>>> --- a/hw/pc.c
>>>> +++ b/hw/pc.c
>>>> @@ -948,6 +948,7 @@ static X86CPU *pc_new_cpu(const char *cpu_model)
>>>>            env->apic_state = apic_init(env, env->cpuid_apic_id);
>>>>        }
>>>>        qemu_register_reset(pc_cpu_reset, cpu);
>>>> +    x86_cpu_realize(OBJECT(cpu), NULL);
>>>>        pc_cpu_reset(cpu);
>>>>        return cpu;
>>>>    }
>>>> diff --git a/target-i386/helper.c b/target-i386/helper.c
>>>> index c52ec13..b38ea7f 100644
>>>> --- a/target-i386/helper.c
>>>> +++ b/target-i386/helper.c
>>>> @@ -1161,8 +1161,6 @@ X86CPU *cpu_x86_init(const char *cpu_model)
>>>>            return NULL;
>>>>        }
>>>>
>>>> -    x86_cpu_realize(OBJECT(cpu), NULL);
>>>> -
>>>>        return cpu;
>>>>    }
>>>>
>>>
>>> This will require changes in linux-user and possibly bsd-user. Having a
>> Why it would require changes in linux-user? So far x86_cpu_realize() does
>> nothing useful in linux-user,  compiled and tested. It should be harmless
>> for linux-user not to execute it.
>
> Hm, I'd need to recheck...
>
>> But I haven't compiled/tested bsd-user, do I need BSD for this?
>
> Yes, you do. But if it's not needed for linux-user then it shouldn't be
> needed for bsd-user either.
>
>>> cpu_realize() would probably help with avoiding #ifdef'ery.
>>> Unfortunately deriving CPUState from DeviceState proves a bit difficult
>>> in the meantime (it worked at one point, now there's lots of circular
>>> header dependencies), and realize support for Object got stopped.
>
>> I'm in process of untangling this header mayhem (at least to a point
>> that allows compilation complete when CPU is derived from Device)
>
> So am I... A few weeks ago my qom-cpu-dev branch on GitHub used to
> compile, now something has changed and I needed to take cpu.h out of
> qemu-common.h and move lots of, e.g., ARM devices into libhw to avoid
> cpu.h dependencies and add cpu.h includes elsewhere. Would be good to
> coordinate that, are you on IRC later today?

Sure, I'd like to.
Could you send me connection details for "IRC"? I do not know where it is.

>
> Andreas
>

-- 
-----
  Igor