[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-ppc] [PATCH 3/5] spapr: rename spapr_vcpu_id() to spapr_get_vc
From: |
David Gibson |
Subject: |
Re: [Qemu-ppc] [PATCH 3/5] spapr: rename spapr_vcpu_id() to spapr_get_vcpu_id() |
Date: |
Thu, 15 Feb 2018 14:50:07 +1100 |
User-agent: |
Mutt/1.9.2 (2017-12-15) |
On Wed, Feb 14, 2018 at 08:40:44PM +0100, Greg Kurz wrote:
> The spapr_vcpu_id() function is an accessor actually. Let's rename it
> for symmetry with the recently added spapr_set_vcpu_id() helper.
>
> The motivation behind this is that a later patch will consolidate
> the VCPU id formula in a function and spapr_vcpu_id looks like an
> appropriate name.
>
> Signed-off-by: Greg Kurz <address@hidden>
There's some minor details I'm not sure I like about this patch and
the previous one, but nothing important enough to delay the later
parts of the series. So, applied.
> ---
> hw/ppc/spapr.c | 16 ++++++++--------
> include/hw/ppc/spapr.h | 2 +-
> 2 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 30cc48fd5264..18ebc058acdd 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -209,7 +209,7 @@ static int spapr_fixup_cpu_smt_dt(void *fdt, int offset,
> PowerPCCPU *cpu,
> int i, ret = 0;
> uint32_t servers_prop[smt_threads];
> uint32_t gservers_prop[smt_threads * 2];
> - int index = spapr_vcpu_id(cpu);
> + int index = spapr_get_vcpu_id(cpu);
>
> if (cpu->compat_pvr) {
> ret = fdt_setprop_cell(fdt, offset, "cpu-version", cpu->compat_pvr);
> @@ -238,7 +238,7 @@ static int spapr_fixup_cpu_smt_dt(void *fdt, int offset,
> PowerPCCPU *cpu,
>
> static int spapr_fixup_cpu_numa_dt(void *fdt, int offset, PowerPCCPU *cpu)
> {
> - int index = spapr_vcpu_id(cpu);
> + int index = spapr_get_vcpu_id(cpu);
> uint32_t associativity[] = {cpu_to_be32(0x5),
> cpu_to_be32(0x0),
> cpu_to_be32(0x0),
> @@ -342,7 +342,7 @@ static int spapr_fixup_cpu_dt(void *fdt,
> sPAPRMachineState *spapr)
> CPU_FOREACH(cs) {
> PowerPCCPU *cpu = POWERPC_CPU(cs);
> DeviceClass *dc = DEVICE_GET_CLASS(cs);
> - int index = spapr_vcpu_id(cpu);
> + int index = spapr_get_vcpu_id(cpu);
> int compat_smt = MIN(smp_threads, ppc_compat_max_vthreads(cpu));
>
> if (index % spapr->vsmt != 0) {
> @@ -492,7 +492,7 @@ static void spapr_populate_cpu_dt(CPUState *cs, void
> *fdt, int offset,
> PowerPCCPU *cpu = POWERPC_CPU(cs);
> CPUPPCState *env = &cpu->env;
> PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cs);
> - int index = spapr_vcpu_id(cpu);
> + int index = spapr_get_vcpu_id(cpu);
> uint32_t segs[] = {cpu_to_be32(28), cpu_to_be32(40),
> 0xffffffff, 0xffffffff};
> uint32_t tbfreq = kvm_enabled() ? kvmppc_get_tbfreq()
> @@ -626,7 +626,7 @@ static void spapr_populate_cpus_dt_node(void *fdt,
> sPAPRMachineState *spapr)
> */
> CPU_FOREACH_REVERSE(cs) {
> PowerPCCPU *cpu = POWERPC_CPU(cs);
> - int index = spapr_vcpu_id(cpu);
> + int index = spapr_get_vcpu_id(cpu);
> DeviceClass *dc = DEVICE_GET_CLASS(cs);
> int offset;
>
> @@ -3234,7 +3234,7 @@ static void *spapr_populate_hotplug_cpu_dt(CPUState
> *cs, int *fdt_offset,
> {
> PowerPCCPU *cpu = POWERPC_CPU(cs);
> DeviceClass *dc = DEVICE_GET_CLASS(cs);
> - int id = spapr_vcpu_id(cpu);
> + int id = spapr_get_vcpu_id(cpu);
> void *fdt;
> int offset, fdt_size;
> char *nodename;
> @@ -3791,7 +3791,7 @@ static void spapr_pic_print_info(InterruptStatsProvider
> *obj,
> ics_pic_print_info(spapr->ics, mon);
> }
>
> -int spapr_vcpu_id(PowerPCCPU *cpu)
> +int spapr_get_vcpu_id(PowerPCCPU *cpu)
> {
> CPUState *cs = CPU(cpu);
>
> @@ -3828,7 +3828,7 @@ PowerPCCPU *spapr_find_cpu(int vcpu_id)
> CPU_FOREACH(cs) {
> PowerPCCPU *cpu = POWERPC_CPU(cs);
>
> - if (spapr_vcpu_id(cpu) == vcpu_id) {
> + if (spapr_get_vcpu_id(cpu) == vcpu_id) {
> return cpu;
> }
> }
> diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
> index af19320d2f8a..36942b378daa 100644
> --- a/include/hw/ppc/spapr.h
> +++ b/include/hw/ppc/spapr.h
> @@ -766,7 +766,7 @@ void spapr_do_system_reset_on_cpu(CPUState *cs,
> run_on_cpu_data arg);
>
> #define HTAB_SIZE(spapr) (1ULL << ((spapr)->htab_shift))
>
> -int spapr_vcpu_id(PowerPCCPU *cpu);
> +int spapr_get_vcpu_id(PowerPCCPU *cpu);
> void spapr_set_vcpu_id(PowerPCCPU *cpu, int cpu_index, Error **errp);
> PowerPCCPU *spapr_find_cpu(int vcpu_id);
>
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
- [Qemu-ppc] [PATCH 0/5] spapr: fix VCPU ids miscalculation, Greg Kurz, 2018/02/14
- [Qemu-ppc] [PATCH 1/5] spapr: use spapr->vsmt to compute VCPU ids, Greg Kurz, 2018/02/14
- [Qemu-ppc] [PATCH 2/5] spapr: move VCPU calculation to core machine code, Greg Kurz, 2018/02/14
- [Qemu-ppc] [PATCH 3/5] spapr: rename spapr_vcpu_id() to spapr_get_vcpu_id(), Greg Kurz, 2018/02/14
- Re: [Qemu-ppc] [PATCH 3/5] spapr: rename spapr_vcpu_id() to spapr_get_vcpu_id(),
David Gibson <=
- [Qemu-ppc] [PATCH 4/5] spapr: consolidate the VCPU id numbering logic in a single place, Greg Kurz, 2018/02/14
- [Qemu-ppc] [PATCH 5/5] spapr: drop DIV_ROUND_UP() from xics_max_server_number(), Greg Kurz, 2018/02/14