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

exec: split cpu_exec_init() 



Put in cpu_exec_initfn() what initializes the CPU,
and leave in cpu_exec_init() what adds it to the environment.

As cpu_exec_initfn() is called by all XX_cpu_initfn(), call it
directly in cpu_common_initfn().
cpu_exec_init() is now a realize function, it will be renamed
to cpu_exec_realizefn() and moved to the XX_cpu_realizefn()
function in a following patch.

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>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 00d0f9fd

exec.c

+6 −4
Original line number Diff line number Diff line
@@ -610,11 +610,8 @@ void cpu_exec_exit(CPUState *cpu) 
    }

}



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

void cpu_exec_initfn(CPUState *cpu)

{

    CPUClass *cc ATTRIBUTE_UNUSED = CPU_GET_CLASS(cpu);

    Error *local_err ATTRIBUTE_UNUSED = NULL;



    cpu->as = NULL;

    cpu->num_ases = 0;
@@ -635,6 +632,11 @@ void cpu_exec_init(CPUState *cpu, Error **errp) 
    cpu->memory = system_memory;

    object_ref(OBJECT(cpu->memory));

#endif

}



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

{

    CPUClass *cc ATTRIBUTE_UNUSED = CPU_GET_CLASS(cpu);



    cpu_list_add(cpu);

include/qom/cpu.h

+1 −0
Original line number Diff line number Diff line
@@ -946,6 +946,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_exit(CPUState *cpu);



#ifdef CONFIG_SOFTMMU

qom/cpu.c

+2 −0
Original line number Diff line number Diff line
@@ -362,6 +362,8 @@ static void cpu_common_initfn(Object *obj) 
    QTAILQ_INIT(&cpu->watchpoints);



    cpu->trace_dstate = bitmap_new(trace_get_vcpu_event_count());



    cpu_exec_initfn(cpu);

}



static void cpu_common_finalize(Object *obj)