On 09/04/2017 11:43 AM, David Hildenbrand wrote:
> Adapt to the new term "core_id". While at it, fix the type and drop the
> initialization to 0 (which is superfluous).
>
> Signed-off-by: David Hildenbrand <da...@redhat.com>
Given the prior patch, this rename makes sense.
Reviewed-by: Matthew Rosato <mjros...@linux.vnet.ibm.com>
> ---
> target/s390x/cpu-qom.h | 2 +-
> 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 c8fbf8ae03..21ea15e642 100644
> --- a/target/s390x/cpu-qom.h
> +++ b/target/s390x/cpu-qom.h
> @@ -52,7 +52,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 a2570bbc6b..105ff13034 100644
> --- a/target/s390x/cpu.c
> +++ b/target/s390x/cpu.c
> @@ -197,7 +197,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)) {
> @@ -205,10 +205,10 @@ static void s390_cpu_realizefn(DeviceState *dev, Error
> **errp)
> 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: %" PRIu32
> - ", the next available nr is %" PRIi64, cpu->env.core_id,
> - scc->next_cpu_id);
> + ", the next available id is %" PRIu32, cpu->env.core_id,
> + scc->next_core_id);
> goto out;
> }
>
> @@ -218,7 +218,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);
> @@ -463,7 +463,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;
>
