ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/s390x: get rid of next_core_id 

core_id is not needed by linux-user, as the core_id a.k.a. CPU address
is only accessible from kernel space.

Therefore, drop next_core_id and make cpu_index get autoassigned again
for linux-user.

While at it, shield core_id and cpuid completely from linux-user. cpuid
can also only be queried from kernel space.

Suggested-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>

Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20170928134609.16985-5-david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
David Hildenbrand 2017-09-28 15:46:08 +02:00 committed by Cornelia Huck
parent c547a757f4
commit 1e70ba24a9
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,8 +54,6 @@ typedef struct S390CPUClass {
bool is_migration_safe; bool is_migration_safe;
const char *desc; const char *desc;
uint32_t next_core_id;
DeviceRealize parent_realize; DeviceRealize parent_realize;
void (*parent_reset)(CPUState *cpu); void (*parent_reset)(CPUState *cpu);
void (*load_normal)(CPUState *cpu); void (*load_normal)(CPUState *cpu);

14
target/s390x/cpu.c
View File

@ -178,8 +178,9 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp)
{ {
CPUState *cs = CPU(dev); CPUState *cs = CPU(dev);
S390CPUClass *scc = S390_CPU_GET_CLASS(dev); S390CPUClass *scc = S390_CPU_GET_CLASS(dev);
#if !defined(CONFIG_USER_ONLY)
S390CPU *cpu = S390_CPU(dev); S390CPU *cpu = S390_CPU(dev);
CPUS390XState *env = &cpu->env; #endif
Error *err = NULL; Error *err = NULL;
/* the model has to be realized before qemu_init_vcpu() due to kvm */ /* the model has to be realized before qemu_init_vcpu() due to kvm */
@ -195,11 +196,6 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp)
max_cpus - 1); max_cpus - 1);
goto out; goto out;
} }
#else
/* implicitly set for linux-user only */
cpu->env.core_id = scc->next_core_id;
scc->next_core_id++;
#endif
if (cpu_exists(cpu->env.core_id)) { if (cpu_exists(cpu->env.core_id)) {
error_setg(&err, "Unable to add CPU with core-id: %" PRIu32 error_setg(&err, "Unable to add CPU with core-id: %" PRIu32
@ -208,7 +204,9 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp)
} }
/* sync cs->cpu_index and env->core_id. The latter is needed for TCG. */ /* sync cs->cpu_index and env->core_id. The latter is needed for TCG. */
cs->cpu_index = env->core_id; cs->cpu_index = cpu->env.core_id;
#endif
cpu_exec_realizefn(cs, &err); cpu_exec_realizefn(cs, &err);
if (err != NULL) { if (err != NULL) {
goto out; goto out;
@ -440,7 +438,9 @@ static gchar *s390_gdb_arch_name(CPUState *cs)
} }
static Property s390x_cpu_properties[] = { static Property s390x_cpu_properties[] = {
#if !defined(CONFIG_USER_ONLY)
DEFINE_PROP_UINT32("core-id", S390CPU, env.core_id, 0), DEFINE_PROP_UINT32("core-id", S390CPU, env.core_id, 0),
#endif
DEFINE_PROP_END_OF_LIST() DEFINE_PROP_END_OF_LIST()
}; };

2
target/s390x/cpu.h
View File

@ -151,8 +151,10 @@ struct CPUS390XState {
CPU_COMMON CPU_COMMON
#if !defined(CONFIG_USER_ONLY)
uint32_t core_id; /* PoP "CPU address", same as cpu_index */ uint32_t core_id; /* PoP "CPU address", same as cpu_index */
uint64_t cpuid; uint64_t cpuid;
#endif
uint64_t tod_offset; uint64_t tod_offset;
uint64_t tod_basetime; uint64_t tod_basetime;

2
target/s390x/cpu_models.c
View File

@ -945,11 +945,13 @@ void s390_realize_cpu_model(CPUState *cs, Error **errp)
apply_cpu_model(cpu->model, errp); apply_cpu_model(cpu->model, errp);
#if !defined(CONFIG_USER_ONLY)
cpu->env.cpuid = s390_cpuid_from_cpu_model(cpu->model); cpu->env.cpuid = s390_cpuid_from_cpu_model(cpu->model);
if (tcg_enabled()) { if (tcg_enabled()) {
/* basic mode, write the cpu address into the first 4 bit of the ID */ /* basic mode, write the cpu address into the first 4 bit of the ID */
cpu->env.cpuid = deposit64(cpu->env.cpuid, 54, 4, cpu->env.core_id); cpu->env.cpuid = deposit64(cpu->env.cpuid, 54, 4, cpu->env.core_id);
} }
#endif
} }
static void get_feature(Object *obj, Visitor *v, const char *name, static void get_feature(Object *obj, Visitor *v, const char *name,