Commit 32dc6aa0 authored by Igor Mammedov's avatar Igor Mammedov Committed by Cornelia Huck
Browse files

s390x: move s390x_new_cpu() into board code 



s390-virtio-ccw.c is the sole user of s390x_new_cpu(),
so move this helper there.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Message-Id: <1508253203-119237-1-git-send-email-imammedo@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent ac7e4cbb

hw/s390x/s390-virtio-ccw.c

+21 −0
Original line number Diff line number Diff line
@@ -52,6 +52,27 @@ S390CPU *s390_cpu_addr2state(uint16_t cpu_addr) 
    return S390_CPU(ms->possible_cpus->cpus[cpu_addr].cpu);

}



static S390CPU *s390x_new_cpu(const char *typename, uint32_t core_id,

                              Error **errp)

{

    S390CPU *cpu = S390_CPU(object_new(typename));

    Error *err = NULL;



    object_property_set_int(OBJECT(cpu), core_id, "core-id", &err);

    if (err != NULL) {

        goto out;

    }

    object_property_set_bool(OBJECT(cpu), true, "realized", &err);



out:

    object_unref(OBJECT(cpu));

    if (err) {

        error_propagate(errp, err);

        cpu = NULL;

    }

    return cpu;

}



static void s390_init_cpus(MachineState *machine)

{

    MachineClass *mc = MACHINE_GET_CLASS(machine);

target/s390x/cpu.h

+0 −1
Original line number Diff line number Diff line
@@ -702,7 +702,6 @@ void s390_cpu_list(FILE *f, fprintf_function cpu_fprintf); 


/* helper.c */

#define cpu_init(cpu_model) cpu_generic_init(TYPE_S390_CPU, cpu_model)

S390CPU *s390x_new_cpu(const char *typename, uint32_t core_id, Error **errp);



#define S390_CPU_TYPE_SUFFIX "-" TYPE_S390_CPU

#define S390_CPU_TYPE_NAME(name) (name S390_CPU_TYPE_SUFFIX)

target/s390x/helper.c

+0 −20
Original line number Diff line number Diff line
@@ -61,26 +61,6 @@ void s390x_cpu_timer(void *opaque) 
}

#endif



S390CPU *s390x_new_cpu(const char *typename, uint32_t core_id, Error **errp)

{

    S390CPU *cpu = S390_CPU(object_new(typename));

    Error *err = NULL;



    object_property_set_int(OBJECT(cpu), core_id, "core-id", &err);

    if (err != NULL) {

        goto out;

    }

    object_property_set_bool(OBJECT(cpu), true, "realized", &err);



out:

    object_unref(OBJECT(cpu));

    if (err) {

        error_propagate(errp, err);

        cpu = NULL;

    }

    return cpu;

}



#ifndef CONFIG_USER_ONLY



hwaddr s390_cpu_get_phys_page_debug(CPUState *cs, vaddr vaddr)