On Mon, 11 Sep 2017 17:21:43 +0200
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).
>
> Reviewed-by: Matthew Rosato
> Signed-off-by: David Hildenbrand
> ---
> 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 2435cd8390..2e446fab51 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;
is it possible to hotplug cpus in out of order in real hw?
>
> DeviceRealize parent_realize;
> void (*parent_reset)(CPUState *cpu);
> diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
> index 87ebbe5b28..8c1c644057 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;
