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

target/s390x: set cpu->id for linux user when realizing 



scc->next_cpu_id is updated when realizing. Setting it just before that
point looks cleaner.

Reviewed-by: default avatarMatthew Rosato <mjrosato@linux.vnet.ibm.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20170913132417.24384-13-david@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent b5684cd8

target/s390x/cpu.c

+4 −7
Original line number Diff line number Diff line
@@ -194,7 +194,11 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp) 
                   ", max allowed: %d", cpu->id, max_cpus - 1);

        goto out;

    }

#else

    /* implicitly set for linux-user only */

    cpu->id = scc->next_cpu_id;

#endif



    if (cpu_exists(cpu->id)) {

        error_setg(&err, "Unable to add CPU: %" PRIi64

                   ", it already exists", cpu->id);
@@ -306,13 +310,6 @@ static void s390_cpu_initfn(Object *obj) 
        inited = true;

        s390x_translate_init();

    }



#if defined(CONFIG_USER_ONLY)

    {

        S390CPUClass *scc = S390_CPU_GET_CLASS(obj);

        cpu->id = scc->next_cpu_id;

    }

#endif

}



static void s390_cpu_finalize(Object *obj)