Commit b599fef2 authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

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: default avatarMatthew Rosato <mjrosato@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20170913132417.24384-15-david@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent ca5c1457

target/s390x/cpu-qom.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

target/s390x/cpu.c

+5 −6
Original line number Diff line number Diff line
@@ -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;