[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-ppc] [PATCH 4/7] pc: pass apic_id to pc_find_cpu_slot() direct
From: |
David Gibson |
Subject: |
Re: [Qemu-ppc] [PATCH 4/7] pc: pass apic_id to pc_find_cpu_slot() directly so lookup could be done without CPU object |
Date: |
Fri, 10 Feb 2017 10:26:59 +1100 |
User-agent: |
Mutt/1.7.1 (2016-10-04) |
On Thu, Feb 09, 2017 at 12:08:35PM +0100, Igor Mammedov wrote:
> Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: David Gibson <address@hidden>
> ---
> hw/i386/pc.c | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index f03a555..ec6dded 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1783,12 +1783,11 @@ static int pc_apic_cmp(const void *a, const void *b)
> * in ms->possible_cpus->cpus, if ms->possible_cpus->cpus has no
> * entry corresponding to CPU's apic_id returns NULL.
> */
> -static CPUArchId *pc_find_cpu_slot(MachineState *ms, CPUState *cpu, int *idx)
> +static CPUArchId *pc_find_cpu_slot(MachineState *ms, uint32_t id, int *idx)
> {
> - CPUClass *cc = CPU_GET_CLASS(cpu);
> CPUArchId apic_id, *found_cpu;
>
> - apic_id.arch_id = cc->get_arch_id(CPU(cpu));
> + apic_id.arch_id = id;
> found_cpu = bsearch(&apic_id, ms->possible_cpus->cpus,
> ms->possible_cpus->len, sizeof(*ms->possible_cpus->cpus),
> pc_apic_cmp);
> @@ -1804,6 +1803,7 @@ static void pc_cpu_plug(HotplugHandler *hotplug_dev,
> CPUArchId *found_cpu;
> HotplugHandlerClass *hhc;
> Error *local_err = NULL;
> + X86CPU *cpu = X86_CPU(dev);
> PCMachineState *pcms = PC_MACHINE(hotplug_dev);
>
> if (pcms->acpi_dev) {
> @@ -1823,7 +1823,7 @@ static void pc_cpu_plug(HotplugHandler *hotplug_dev,
> fw_cfg_modify_i16(pcms->fw_cfg, FW_CFG_NB_CPUS, pcms->boot_cpus);
> }
>
> - found_cpu = pc_find_cpu_slot(MACHINE(pcms), CPU(dev), NULL);
> + found_cpu = pc_find_cpu_slot(MACHINE(pcms), cpu->apic_id, NULL);
> found_cpu->cpu = CPU(dev);
> out:
> error_propagate(errp, local_err);
> @@ -1834,9 +1834,10 @@ static void pc_cpu_unplug_request_cb(HotplugHandler
> *hotplug_dev,
> int idx = -1;
> HotplugHandlerClass *hhc;
> Error *local_err = NULL;
> + X86CPU *cpu = X86_CPU(dev);
> PCMachineState *pcms = PC_MACHINE(hotplug_dev);
>
> - pc_find_cpu_slot(MACHINE(pcms), CPU(dev), &idx);
> + pc_find_cpu_slot(MACHINE(pcms), cpu->apic_id, &idx);
> assert(idx != -1);
> if (idx == 0) {
> error_setg(&local_err, "Boot CPU is unpluggable");
> @@ -1861,6 +1862,7 @@ static void pc_cpu_unplug_cb(HotplugHandler
> *hotplug_dev,
> CPUArchId *found_cpu;
> HotplugHandlerClass *hhc;
> Error *local_err = NULL;
> + X86CPU *cpu = X86_CPU(dev);
> PCMachineState *pcms = PC_MACHINE(hotplug_dev);
>
> hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev);
> @@ -1870,7 +1872,7 @@ static void pc_cpu_unplug_cb(HotplugHandler
> *hotplug_dev,
> goto out;
> }
>
> - found_cpu = pc_find_cpu_slot(MACHINE(pcms), CPU(dev), NULL);
> + found_cpu = pc_find_cpu_slot(MACHINE(pcms), cpu->apic_id, NULL);
> found_cpu->cpu = NULL;
> object_unparent(OBJECT(dev));
>
> @@ -1928,7 +1930,7 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
> cpu->apic_id = apicid_from_topo_ids(smp_cores, smp_threads, &topo);
> }
>
> - cpu_slot = pc_find_cpu_slot(MACHINE(pcms), CPU(dev), &idx);
> + cpu_slot = pc_find_cpu_slot(MACHINE(pcms), cpu->apic_id, &idx);
> if (!cpu_slot) {
> MachineState *ms = MACHINE(pcms);
>
--
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/7] pc/spapr: unify handling of possible CPUs, Igor Mammedov, 2017/02/09
- [Qemu-ppc] [PATCH 2/7] pc: move pcms->possible_cpus init out of pc_cpus_init(), Igor Mammedov, 2017/02/09
- [Qemu-ppc] [PATCH 1/7] machine: move possible_cpus to MachineState, Igor Mammedov, 2017/02/09
- [Qemu-ppc] [PATCH 3/7] pc: calculate topology only once when possible_cpus is initialised, Igor Mammedov, 2017/02/09
- [Qemu-ppc] [PATCH 4/7] pc: pass apic_id to pc_find_cpu_slot() directly so lookup could be done without CPU object, Igor Mammedov, 2017/02/09
- Re: [Qemu-ppc] [PATCH 4/7] pc: pass apic_id to pc_find_cpu_slot() directly so lookup could be done without CPU object,
David Gibson <=
- [Qemu-ppc] [PATCH 5/7] change CPUArchId.cpu type to Object*, Igor Mammedov, 2017/02/09
- [Qemu-ppc] [PATCH 6/7] spapr: reuse machine->possible_cpus instead of cores[], Igor Mammedov, 2017/02/09
- [Qemu-ppc] [PATCH 7/7] machine: unify [pc_|spapr_]query_hotpluggable_cpus() callbacks, Igor Mammedov, 2017/02/09
- [Qemu-ppc] [PATCH v2 8/7] machine: replace query_hotpluggable_cpus() callback with has_hotpluggable_cpus flag, Igor Mammedov, 2017/02/10
- Re: [Qemu-ppc] [Qemu-devel] [PATCH 0/7] pc/spapr: unify handling of possible CPUs, Igor Mammedov, 2017/02/10