OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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:
David Hildenbrand 2017-09-13 15:24:09 +02:00 committed by Cornelia Huck
parent ca5c1457d6
commit b599fef28e
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/s390x/cpu-qom.h
View File

@ -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);

11
target/s390x/cpu.c
View File

@ -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;