From nobody Mon Feb 9 13:59:41 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 150174182682752.4501768687544; Wed, 2 Aug 2017 23:30:26 -0700 (PDT) Received: from localhost ([::1]:40752 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dd9eJ-00062w-0h for importer@patchew.org; Thu, 03 Aug 2017 02:30:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48409) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dd9ct-0005G0-U5 for qemu-devel@nongnu.org; Thu, 03 Aug 2017 02:28:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dd9cq-0007K9-Oc for qemu-devel@nongnu.org; Thu, 03 Aug 2017 02:28:55 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:38971) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dd9cq-0007J4-ES for qemu-devel@nongnu.org; Thu, 03 Aug 2017 02:28:52 -0400 Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v736Scln069713 for ; Thu, 3 Aug 2017 02:28:51 -0400 Received: from e23smtp08.au.ibm.com (e23smtp08.au.ibm.com [202.81.31.141]) by mx0a-001b2d01.pphosted.com with ESMTP id 2c3x4v1jv0-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 03 Aug 2017 02:28:50 -0400 Received: from localhost by e23smtp08.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 3 Aug 2017 16:28:48 +1000 Received: from d23relay06.au.ibm.com (202.81.31.225) by e23smtp08.au.ibm.com (202.81.31.205) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 3 Aug 2017 16:28:46 +1000 Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay06.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v736Skth18350252; Thu, 3 Aug 2017 16:28:46 +1000 Received: from d23av01.au.ibm.com (localhost [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id v736Sjct032089; Thu, 3 Aug 2017 16:28:45 +1000 Received: from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.192.253.14]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id v736SjR4032083; Thu, 3 Aug 2017 16:28:45 +1000 Received: from tungsten.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id 69C8CA0098; Thu, 3 Aug 2017 16:28:45 +1000 (AEST) Date: Thu, 3 Aug 2017 16:28:44 +1000 From: Sam Bobroff To: qemu-ppc@nongnu.org, qemu-devel@nongnu.org References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20170113 (1.7.2) X-TM-AS-MML: disable x-cbid: 17080306-0048-0000-0000-000002577B09 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17080306-0049-0000-0000-0000480A44E8 Message-Id: <5777ef503c5c7f43f21981ed11c90fb7579ccfae.1501740002.git.sam.bobroff@au1.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-08-03_03:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1706020000 definitions=main-1708030100 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH 3/4] ppc: spapr: Rename cpu_dt_id to vcpu_id X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: agraf@suse.de, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Greg Kurz --- hw/ppc/ppc.c | 8 ++++---- hw/ppc/spapr.c | 16 ++++++++-------- hw/ppc/spapr_hcall.c | 4 ++-- hw/ppc/spapr_rtas.c | 4 ++-- target/ppc/cpu.h | 14 +++++++------- target/ppc/kvm.c | 2 +- target/ppc/translate_init.c | 8 ++++---- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index 224184d66d..4477d4ad89 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -1359,19 +1359,19 @@ void PPC_debug_write (void *opaque, uint32_t addr, = uint32_t val) } =20 /* CPU device-tree ID helpers */ -int ppc_get_vcpu_dt_id(PowerPCCPU *cpu) +int ppc_get_vcpu_id(PowerPCCPU *cpu) { - return cpu->cpu_dt_id; + return cpu->vcpu_id; } =20 -PowerPCCPU *ppc_get_vcpu_by_dt_id(int cpu_dt_id) +PowerPCCPU *ppc_get_cpu_by_vcpu_id(int vcpu_id) { CPUState *cs; =20 CPU_FOREACH(cs) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); =20 - if (cpu->cpu_dt_id =3D=3D cpu_dt_id) { + if (cpu->vcpu_id =3D=3D vcpu_id) { return cpu; } } diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index f7a19720dc..83c77096a6 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -208,7 +208,7 @@ static int spapr_fixup_cpu_smt_dt(void *fdt, int offset= , PowerPCCPU *cpu, int i, ret =3D 0; uint32_t servers_prop[smt_threads]; uint32_t gservers_prop[smt_threads * 2]; - int index =3D ppc_get_vcpu_dt_id(cpu); + int index =3D ppc_get_vcpu_id(cpu); =20 if (cpu->compat_pvr) { ret =3D fdt_setprop_cell(fdt, offset, "cpu-version", cpu->compat_p= vr); @@ -237,7 +237,7 @@ static int spapr_fixup_cpu_smt_dt(void *fdt, int offset= , PowerPCCPU *cpu, =20 static int spapr_fixup_cpu_numa_dt(void *fdt, int offset, PowerPCCPU *cpu) { - int index =3D ppc_get_vcpu_dt_id(cpu); + int index =3D ppc_get_vcpu_id(cpu); uint32_t associativity[] =3D {cpu_to_be32(0x5), cpu_to_be32(0x0), cpu_to_be32(0x0), @@ -341,7 +341,7 @@ static int spapr_fixup_cpu_dt(void *fdt, sPAPRMachineSt= ate *spapr) PowerPCCPU *cpu =3D POWERPC_CPU(cs); CPUPPCState *env =3D &cpu->env; DeviceClass *dc =3D DEVICE_GET_CLASS(cs); - int index =3D ppc_get_vcpu_dt_id(cpu); + int index =3D ppc_get_vcpu_id(cpu); int compat_smt =3D MIN(smp_threads, ppc_compat_max_threads(cpu)); =20 if ((index % smt) !=3D 0) { @@ -493,7 +493,7 @@ static void spapr_populate_cpu_dt(CPUState *cs, void *f= dt, int offset, PowerPCCPU *cpu =3D POWERPC_CPU(cs); CPUPPCState *env =3D &cpu->env; PowerPCCPUClass *pcc =3D POWERPC_CPU_GET_CLASS(cs); - int index =3D ppc_get_vcpu_dt_id(cpu); + int index =3D ppc_get_vcpu_id(cpu); uint32_t segs[] =3D {cpu_to_be32(28), cpu_to_be32(40), 0xffffffff, 0xffffffff}; uint32_t tbfreq =3D kvm_enabled() ? kvmppc_get_tbfreq() @@ -626,7 +626,7 @@ static void spapr_populate_cpus_dt_node(void *fdt, sPAP= RMachineState *spapr) */ CPU_FOREACH_REVERSE(cs) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); - int index =3D ppc_get_vcpu_dt_id(cpu); + int index =3D ppc_get_vcpu_id(cpu); DeviceClass *dc =3D DEVICE_GET_CLASS(cs); int offset; =20 @@ -2982,7 +2982,7 @@ static void *spapr_populate_hotplug_cpu_dt(CPUState *= cs, int *fdt_offset, { PowerPCCPU *cpu =3D POWERPC_CPU(cs); DeviceClass *dc =3D DEVICE_GET_CLASS(cs); - int id =3D ppc_get_vcpu_dt_id(cpu); + int id =3D ppc_get_vcpu_id(cpu); void *fdt; int offset, fdt_size; char *nodename; @@ -3390,9 +3390,9 @@ static void spapr_ics_resend(XICSFabric *dev) ics_resend(spapr->ics); } =20 -static ICPState *spapr_icp_get(XICSFabric *xi, int cpu_dt_id) +static ICPState *spapr_icp_get(XICSFabric *xi, int vcpu_id) { - PowerPCCPU *cpu =3D ppc_get_vcpu_by_dt_id(cpu_dt_id); + PowerPCCPU *cpu =3D ppc_get_cpu_by_vcpu_id(vcpu_id); =20 return cpu ? ICP(cpu->intc) : NULL; } diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 07b3da8dc4..4ca233854a 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -999,7 +999,7 @@ static target_ulong h_register_vpa(PowerPCCPU *cpu, sPA= PRMachineState *spapr, CPUPPCState *tenv; PowerPCCPU *tcpu; =20 - tcpu =3D ppc_get_vcpu_by_dt_id(procno); + tcpu =3D ppc_get_cpu_by_vcpu_id(procno); if (!tcpu) { return H_PARAMETER; } @@ -1431,7 +1431,7 @@ static target_ulong h_signal_sys_reset(PowerPCCPU *cp= u, =20 } else { /* Unicast */ - cs =3D CPU(ppc_get_vcpu_by_dt_id(target)); + cs =3D CPU(ppc_get_cpu_by_vcpu_id(target)); if (cs) { run_on_cpu(cs, spapr_do_system_reset_on_cpu, RUN_ON_CPU_NULL); return H_SUCCESS; diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c index 94a2799b99..626c06b375 100644 --- a/hw/ppc/spapr_rtas.c +++ b/hw/ppc/spapr_rtas.c @@ -104,7 +104,7 @@ static void rtas_query_cpu_stopped_state(PowerPCCPU *cp= u_, } =20 id =3D rtas_ld(args, 0); - cpu =3D ppc_get_vcpu_by_dt_id(id); + cpu =3D ppc_get_cpu_by_vcpu_id(id); if (cpu !=3D NULL) { if (CPU(cpu)->halted) { rtas_st(rets, 1, 0); @@ -158,7 +158,7 @@ static void rtas_start_cpu(PowerPCCPU *cpu_, sPAPRMachi= neState *spapr, start =3D rtas_ld(args, 1); r3 =3D rtas_ld(args, 2); =20 - cpu =3D ppc_get_vcpu_by_dt_id(id); + cpu =3D ppc_get_cpu_by_vcpu_id(id); if (cpu !=3D NULL) { CPUState *cs =3D CPU(cpu); CPUPPCState *env =3D &cpu->env; diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 6ee2a26a96..89f05542c6 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1199,7 +1199,7 @@ struct PowerPCCPU { /*< public >*/ =20 CPUPPCState env; - int cpu_dt_id; + int vcpu_id; uint32_t compat_pvr; PPCVirtualHypervisor *vhyp; Object *intc; @@ -2514,22 +2514,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); =20 /** - * 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); =20 /** - * 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); =20 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 85713795de..7ccb350c5f 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -512,7 +512,7 @@ bool kvmppc_is_mem_backend_page_size_ok(const char *obj= _path) =20 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)); } =20 /* e500 supports 2 h/w breakpoint and 2 watchpoint. diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c index 01723bdfec..a80e9ffdf8 100644 --- a/target/ppc/translate_init.c +++ b/target/ppc/translate_init.c @@ -9828,14 +9828,14 @@ static void ppc_cpu_realizefn(DeviceState *dev, Err= or **errp) } =20 #if !defined(CONFIG_USER_ONLY) - cpu->cpu_dt_id =3D (cs->cpu_index / smp_threads) * max_smt + cpu->vcpu_id =3D (cs->cpu_index / smp_threads) * max_smt + (cs->cpu_index % smp_threads); =20 - 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_i= d); 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 --=20 2.12.1.382.gc0f9c7058