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>
This commit is contained in:
parent
ca5c1457d6
commit
b599fef28e
|
@ -54,7 +54,7 @@ typedef struct S390CPUClass {
|
||||||
bool is_migration_safe;
|
bool is_migration_safe;
|
||||||
const char *desc;
|
const char *desc;
|
||||||
|
|
||||||
int64_t next_cpu_id;
|
uint32_t next_core_id;
|
||||||
|
|
||||||
DeviceRealize parent_realize;
|
DeviceRealize parent_realize;
|
||||||
void (*parent_reset)(CPUState *cpu);
|
void (*parent_reset)(CPUState *cpu);
|
||||||
|
|
|
@ -198,7 +198,7 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp)
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
/* implicitly set for linux-user only */
|
/* implicitly set for linux-user only */
|
||||||
cpu->env.core_id = scc->next_cpu_id;
|
cpu->env.core_id = scc->next_core_id;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (cpu_exists(cpu->env.core_id)) {
|
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);
|
", it already exists", cpu->env.core_id);
|
||||||
goto out;
|
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
|
error_setg(&err, "Unable to add CPU with core-id: %" PRIu32
|
||||||
", the next available core-id is %" PRIi64, cpu->env.core_id,
|
", the next available core-id is %" PRIu32, cpu->env.core_id,
|
||||||
scc->next_cpu_id);
|
scc->next_core_id);
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -219,7 +219,7 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp)
|
||||||
if (err != NULL) {
|
if (err != NULL) {
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
scc->next_cpu_id++;
|
scc->next_core_id++;
|
||||||
|
|
||||||
#if !defined(CONFIG_USER_ONLY)
|
#if !defined(CONFIG_USER_ONLY)
|
||||||
qemu_register_reset(s390_cpu_machine_reset_cb, cpu);
|
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);
|
CPUClass *cc = CPU_CLASS(scc);
|
||||||
DeviceClass *dc = DEVICE_CLASS(oc);
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
||||||
|
|
||||||
scc->next_cpu_id = 0;
|
|
||||||
scc->parent_realize = dc->realize;
|
scc->parent_realize = dc->realize;
|
||||||
dc->realize = s390_cpu_realizefn;
|
dc->realize = s390_cpu_realizefn;
|
||||||
dc->props = s390x_cpu_properties;
|
dc->props = s390x_cpu_properties;
|
||||||
|
|
Loading…
Reference in a new issue