diff options
| author | David Hildenbrand <david@redhat.com> | 2017-09-13 15:24:09 +0200 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2017-09-19 18:31:32 +0200 |
| commit | b599fef28e161ef2a8d3bac18eace4e405421055 (patch) | |
| tree | 93fc01a479a22bb8c3a2759bee96942e7867557f /target | |
| parent | ca5c1457d614fec718aaec7bdf3663dec37e1e50 (diff) | |
| download | qemu-b599fef28e161ef2a8d3bac18eace4e405421055.zip qemu-b599fef28e161ef2a8d3bac18eace4e405421055.tar.gz qemu-b599fef28e161ef2a8d3bac18eace4e405421055.tar.bz2 | |
target/s390x: rename next_cpu_id to next_core_id
Adapt to the new term "core_id". While at it, fix the type and drop the
initialization to 0 (which is superfluous).
Reviewed-by: Matthew Rosato <mjrosato@linux.vnet.ibm.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20170913132417.24384-15-david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'target')
| -rw-r--r-- | target/s390x/cpu-qom.h | 2 | ||||
| -rw-r--r-- | target/s390x/cpu.c | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/target/s390x/cpu-qom.h b/target/s390x/cpu-qom.h index 2435cd8..2e446fa 100644 --- a/target/s390x/cpu-qom.h +++ b/target/s390x/cpu-qom.h @@ -54,7 +54,7 @@ typedef struct S390CPUClass { bool is_migration_safe; const char *desc; - int64_t next_cpu_id; + uint32_t next_core_id; DeviceRealize parent_realize; void (*parent_reset)(CPUState *cpu); diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 87ebbe5..8c1c644 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -198,7 +198,7 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp) } #else /* implicitly set for linux-user only */ - cpu->env.core_id = scc->next_cpu_id; + cpu->env.core_id = scc->next_core_id; #endif if (cpu_exists(cpu->env.core_id)) { @@ -206,10 +206,10 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp) ", it already exists", cpu->env.core_id); goto out; } - if (cpu->env.core_id != scc->next_cpu_id) { + if (cpu->env.core_id != scc->next_core_id) { error_setg(&err, "Unable to add CPU with core-id: %" PRIu32 - ", the next available core-id is %" PRIi64, cpu->env.core_id, - scc->next_cpu_id); + ", the next available core-id is %" PRIu32, cpu->env.core_id, + scc->next_core_id); goto out; } @@ -219,7 +219,7 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp) if (err != NULL) { goto out; } - scc->next_cpu_id++; + scc->next_core_id++; #if !defined(CONFIG_USER_ONLY) qemu_register_reset(s390_cpu_machine_reset_cb, cpu); @@ -464,7 +464,6 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data) CPUClass *cc = CPU_CLASS(scc); DeviceClass *dc = DEVICE_CLASS(oc); - scc->next_cpu_id = 0; scc->parent_realize = dc->realize; dc->realize = s390_cpu_realizefn; dc->props = s390x_cpu_properties; |