diff options
| author | Sam Bobroff <sam.bobroff@au1.ibm.com> | 2017-08-03 16:28:44 +1000 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2017-09-08 09:30:55 +1000 |
| commit | 81210c2009296261879af5d58a3a499815031765 (patch) | |
| tree | eeeefcf5c0a44318da81a5d962b49f3dcb380654 /target/ppc/translate_init.c | |
| parent | 6d536570198460743d01a7dc08deda56deee66ab (diff) | |
ppc: spapr: Rename cpu_dt_id to vcpu_id
This field actually records the VCPU ID used by KVM and, although the
value is also used in the device tree it is primarily the VCPU ID so
rename it as such.
Signed-off-by: Sam Bobroff <sam.bobroff@au1.ibm.com>
[dwg: Updated comment missed in cpu.h]
Reviewed-by: Greg Kurz <groug@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'target/ppc/translate_init.c')
| -rw-r--r-- | target/ppc/translate_init.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c index 43be9a8331..1586e28055 100644 --- a/target/ppc/translate_init.c +++ b/target/ppc/translate_init.c @@ -9838,14 +9838,14 @@ static void ppc_cpu_realizefn(DeviceState *dev, Error **errp) } #if !defined(CONFIG_USER_ONLY) - cpu->cpu_dt_id = (cs->cpu_index / smp_threads) * max_smt + cpu->vcpu_id = (cs->cpu_index / smp_threads) * max_smt + (cs->cpu_index % smp_threads); - if (kvm_enabled() && !kvm_vcpu_id_is_valid(cpu->cpu_dt_id)) { - error_setg(errp, "Can't create CPU with id %d in KVM", cpu->cpu_dt_id); + if (kvm_enabled() && !kvm_vcpu_id_is_valid(cpu->vcpu_id)) { + error_setg(errp, "Can't create CPU with id %d in KVM", cpu->vcpu_id); error_append_hint(errp, "Adjust the number of cpus to %d " "or try to raise the number of threads per core\n", - cpu->cpu_dt_id * smp_threads / max_smt); + cpu->vcpu_id * smp_threads / max_smt); goto unrealize; } #endif |