diff options
Diffstat (limited to 'target/ppc')
| -rw-r--r-- | target/ppc/cpu.h | 16 | ||||
| -rw-r--r-- | target/ppc/kvm.c | 2 | ||||
| -rw-r--r-- | target/ppc/translate_init.c | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 12f09492fb..687e66acde 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1188,7 +1188,7 @@ typedef struct PPCVirtualHypervisorClass PPCVirtualHypervisorClass; /** * PowerPCCPU: * @env: #CPUPPCState - * @cpu_dt_id: CPU index used in the device tree. KVM uses this index too + * @vcpu_id: vCPU identifier given to KVM * @compat_pvr: Current logical PVR, zero if in "raw" mode * * A PowerPC CPU. @@ -1199,7 +1199,7 @@ struct PowerPCCPU { /*< public >*/ CPUPPCState env; - int cpu_dt_id; + int vcpu_id; uint32_t compat_pvr; PPCVirtualHypervisor *vhyp; Object *intc; @@ -2515,22 +2515,22 @@ static inline bool lsw_reg_in_range(int start, int nregs, int rx) void dump_mmu(FILE *f, fprintf_function cpu_fprintf, CPUPPCState *env); /** - * ppc_get_vcpu_dt_id: + * ppc_get_vcpu_id: * @cs: a PowerPCCPU struct. * * Returns a device-tree ID for a CPU. */ -int ppc_get_vcpu_dt_id(PowerPCCPU *cpu); +int ppc_get_vcpu_id(PowerPCCPU *cpu); /** - * ppc_get_vcpu_by_dt_id: - * @cpu_dt_id: a device tree id + * ppc_get_cpu_by_vcpu_id: + * @vcpu_id: a VCPU ID * - * Searches for a CPU by @cpu_dt_id. + * Searches for a CPU by @vcpu_id. * * Returns: a PowerPCCPU struct */ -PowerPCCPU *ppc_get_vcpu_by_dt_id(int cpu_dt_id); +PowerPCCPU *ppc_get_cpu_by_vcpu_id(int vcpu_id); void ppc_maybe_bswap_register(CPUPPCState *env, uint8_t *mem_buf, int len); #endif /* PPC_CPU_H */ diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index f31c67e1b1..1142d5c970 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -520,7 +520,7 @@ bool kvmppc_is_mem_backend_page_size_ok(const char *obj_path) unsigned long kvm_arch_vcpu_id(CPUState *cpu) { - return ppc_get_vcpu_dt_id(POWERPC_CPU(cpu)); + return ppc_get_vcpu_id(POWERPC_CPU(cpu)); } /* e500 supports 2 h/w breakpoint and 2 watchpoint. 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 |