From 32dc6aa061e76c9acaefff1faa48ab479672ea53 Mon Sep 17 00:00:00 2001 From: Igor Mammedov Date: Tue, 17 Oct 2017 17:13:23 +0200 Subject: 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: Igor Mammedov Message-Id: <1508253203-119237-1-git-send-email-imammedo@redhat.com> Signed-off-by: Cornelia Huck --- target/s390x/cpu.h | 1 - target/s390x/helper.c | 20 -------------------- 2 files changed, 21 deletions(-) (limited to 'target') diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index b684502..4db8b54 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -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) diff --git a/target/s390x/helper.c b/target/s390x/helper.c index 9ff7ff4..f78983d 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -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) -- cgit v1.1