diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2017-08-31 15:19:38 +0200 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2017-09-01 11:54:24 -0300 |
| commit | 6ad76dfd137b4d43c88f88a3cd27312f066c63ac (patch) | |
| tree | 4c69e2f8e5a7b54f6c7ccdbccfcdc23449e2f1a3 | |
| parent | 3d592ffbabec5120d501d534478c2c95dff29aa7 (diff) | |
s390x: replace cpu_s390x_init() with cpu_generic_init()
cpu_s390x_init() is used only *-user targets indirectly
via cpu_init() macro and has a hack to assign ids to created
cpus (I'm not sure if 'id' really matters to *-user emulation).
So to on safe side, instead of having custom wrapper to do numbering
replace it with cpu_generic_init() and use S390CPUClass::next_cpu_id
which could serve the same purpose as static variable and move cpu->id
initialization to s390_cpu_initfn for CONFIG_USER_ONLY use-case.
PS:
ifdef is ugly but it allows us to hide s390x detail that isn't
set by *-user targets and reuse generic cpu creation utility
for btoh machine and user emulation.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <1504185578-80843-1-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
| -rw-r--r-- | target/s390x/cpu.c | 7 | ||||
| -rw-r--r-- | target/s390x/cpu.h | 3 | ||||
| -rw-r--r-- | target/s390x/helper.c | 14 |
3 files changed, 8 insertions, 16 deletions
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 7267b60d41..74b3e4fd0d 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -306,6 +306,13 @@ static void s390_cpu_initfn(Object *obj) inited = true; s390x_translate_init(); } + +#if defined(CONFIG_USER_ONLY) + { + S390CPUClass *scc = S390_CPU_GET_CLASS(obj); + cpu->id = scc->next_cpu_id; + } +#endif } static void s390_cpu_finalize(Object *obj) diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 4ec338077e..0bd97a5670 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -688,8 +688,7 @@ const char *s390_default_cpu_model_name(void); /* helper.c */ -S390CPU *cpu_s390x_init(const char *cpu_model); -#define cpu_init(model) CPU(cpu_s390x_init(model)) +#define cpu_init(cpu_model) cpu_generic_init(TYPE_S390_CPU, cpu_model) S390CPU *s390x_new_cpu(const char *cpu_model, int64_t id, Error **errp); /* you can call this signal handler from your SIGBUS and SIGSEGV signal handlers to inform the virtual CPU of exceptions. non zero diff --git a/target/s390x/helper.c b/target/s390x/helper.c index 3adb9de122..ba29504476 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -129,20 +129,6 @@ out: return cpu; } -S390CPU *cpu_s390x_init(const char *cpu_model) -{ - Error *err = NULL; - S390CPU *cpu; - /* Use to track CPU ID for linux-user only */ - static int64_t next_cpu_id; - - cpu = s390x_new_cpu(cpu_model, next_cpu_id++, &err); - if (err) { - error_report_err(err); - } - return cpu; -} - #ifndef CONFIG_USER_ONLY hwaddr s390_cpu_get_phys_page_debug(CPUState *cs, vaddr vaddr) |