Commit ce5b1bbf authored by Laurent Vivier's avatar Laurent Vivier Committed by Eduardo Habkost
Browse files

exec: move cpu_exec_init() calls to realize functions 



Modify all CPUs to call it from XXX_cpu_realizefn() function.

Remove all the cannot_destroy_with_object_finalize_yet as
unsafe references have been moved to cpu_exec_realizefn().
(tested with QOM command provided by commit 4c315c27)

for arm:

Setting of cpu->mp_affinity is moved from arm_cpu_initfn()
to arm_cpu_realizefn() as setting of cpu_index is now done
in cpu_exec_realizefn(). To avoid to overwrite an user defined
value, we set it to an invalid value by default, and update
it in realize function only if the value is still invalid.

Signed-off-by: default avatarLaurent Vivier <lvivier@redhat.com>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 39e329e3

exec.c

+1 −1
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ void cpu_exec_initfn(CPUState *cpu) 
#endif

}



void cpu_exec_init(CPUState *cpu, Error **errp)

void cpu_exec_realizefn(CPUState *cpu, Error **errp)

{

    CPUClass *cc ATTRIBUTE_UNUSED = CPU_GET_CLASS(cpu);

include/exec/exec-all.h

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu, 
                              uint32_t flags,

                              int cflags);



void cpu_exec_init(CPUState *cpu, Error **errp);

void QEMU_NORETURN cpu_loop_exit(CPUState *cpu);

void QEMU_NORETURN cpu_loop_exit_restore(CPUState *cpu, uintptr_t pc);

include/qom/cpu.h

+1 −0
Original line number Diff line number Diff line
@@ -947,6 +947,7 @@ AddressSpace *cpu_get_address_space(CPUState *cpu, int asidx); 
void QEMU_NORETURN cpu_abort(CPUState *cpu, const char *fmt, ...)

    GCC_FMT_ATTR(2, 3);

void cpu_exec_initfn(CPUState *cpu);

void cpu_exec_realizefn(CPUState *cpu, Error **errp);

void cpu_exec_exit(CPUState *cpu);



#ifdef CONFIG_SOFTMMU

target-alpha/cpu.c

+7 −8
Original line number Diff line number Diff line
@@ -59,6 +59,13 @@ static void alpha_cpu_realizefn(DeviceState *dev, Error **errp) 
{

    CPUState *cs = CPU(dev);

    AlphaCPUClass *acc = ALPHA_CPU_GET_CLASS(dev);

    Error *local_err = NULL;



    cpu_exec_realizefn(cs, &local_err);

    if (local_err != NULL) {

        error_propagate(errp, local_err);

        return;

    }



    qemu_init_vcpu(cs);
@@ -266,7 +273,6 @@ static void alpha_cpu_initfn(Object *obj) 
    CPUAlphaState *env = &cpu->env;



    cs->env_ptr = env;

    cpu_exec_init(cs, &error_abort);

    tlb_flush(cs, 1);



    alpha_translate_init();
@@ -309,13 +315,6 @@ static void alpha_cpu_class_init(ObjectClass *oc, void *data) 
    cc->disas_set_info = alpha_cpu_disas_set_info;



    cc->gdb_num_core_regs = 67;



    /*

     * Reason: alpha_cpu_initfn() calls cpu_exec_init(), which saves

     * the object in cpus -> dangling pointer after final

     * object_unref().

     */

    dc->cannot_destroy_with_object_finalize_yet = true;

}



static const TypeInfo alpha_cpu_type_info = {

target-arm/cpu-qom.h

+2 −0
Original line number Diff line number Diff line
@@ -80,9 +80,11 @@ void arm_gt_stimer_cb(void *opaque); 
#define ARM_AFF2_MASK  (0xFFULL << ARM_AFF2_SHIFT)

#define ARM_AFF3_SHIFT 32

#define ARM_AFF3_MASK  (0xFFULL << ARM_AFF3_SHIFT)

#define ARM_DEFAULT_CPUS_PER_CLUSTER 8



#define ARM32_AFFINITY_MASK (ARM_AFF0_MASK|ARM_AFF1_MASK|ARM_AFF2_MASK)

#define ARM64_AFFINITY_MASK \

    (ARM_AFF0_MASK|ARM_AFF1_MASK|ARM_AFF2_MASK|ARM_AFF3_MASK)

#define ARM64_AFFINITY_INVALID (~ARM64_AFFINITY_MASK)



#endif