[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 03/11] pc: extract CPU lookup into a separate fu
From: |
Eduardo Habkost |
Subject: |
Re: [Qemu-devel] [PATCH 03/11] pc: extract CPU lookup into a separate function |
Date: |
Thu, 23 Jun 2016 14:32:10 -0300 |
User-agent: |
Mutt/1.6.1 (2016-04-27) |
On Thu, Jun 23, 2016 at 04:54:21PM +0200, Igor Mammedov wrote:
> it will be reused in the next patch at pre_plug time
>
> Signed-off-by: Igor Mammedov <address@hidden>
> ---
> hw/i386/pc.c | 24 +++++++++++++++++-------
> 1 file changed, 17 insertions(+), 7 deletions(-)
>
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 07a3b82..ec9b14b 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1675,11 +1675,25 @@ static int pc_apic_cmp(const void *a, const void *b)
> return apic_a->arch_id - apic_b->arch_id;
> }
>
> +static CPUArchId *pc_find_cpu(PCMachineState *pcms, CPUState *cpu, int *idx)
A short comment explaining what it does (and what does the return
value actually means) would't be bad.
The function name confused me when reviewing patch 07/11, as:
1) returning non-NULL means a CPU "slot"[1] exists, not
necessarily that a CPU exists; 2) returning NULL means that a CPU
doesn't exist _and_ that the ID/slot is not available for
plugging.
I would call it pc_find_cpu_slot() or pc_find_possible_cpu_id().
[1] Or whatever name we choose to call a "possible ID/address for
a CPU".
> +{
> + CPUClass *cc = CPU_GET_CLASS(cpu);
> + CPUArchId apic_id, *found_cpu;
> +
> + apic_id.arch_id = cc->get_arch_id(CPU(cpu));
> + found_cpu = bsearch(&apic_id, pcms->possible_cpus->cpus,
> + pcms->possible_cpus->len, sizeof(*pcms->possible_cpus->cpus),
> + pc_apic_cmp);
> + if (found_cpu && idx) {
> + *idx = found_cpu - pcms->possible_cpus->cpus;
> + }
> + return found_cpu;
> +}
> +
> static void pc_cpu_plug(HotplugHandler *hotplug_dev,
> DeviceState *dev, Error **errp)
> {
> - CPUClass *cc = CPU_GET_CLASS(dev);
> - CPUArchId apic_id, *found_cpu;
> + CPUArchId *found_cpu;
> HotplugHandlerClass *hhc;
> Error *local_err = NULL;
> PCMachineState *pcms = PC_MACHINE(hotplug_dev);
> @@ -1703,11 +1717,7 @@ static void pc_cpu_plug(HotplugHandler *hotplug_dev,
> /* increment the number of CPUs */
> rtc_set_memory(pcms->rtc, 0x5f, rtc_get_memory(pcms->rtc, 0x5f) + 1);
>
> - apic_id.arch_id = cc->get_arch_id(CPU(dev));
> - found_cpu = bsearch(&apic_id, pcms->possible_cpus->cpus,
> - pcms->possible_cpus->len, sizeof(*pcms->possible_cpus->cpus),
> - pc_apic_cmp);
> - assert(found_cpu);
> + found_cpu = pc_find_cpu(pcms, CPU(dev), NULL);
> found_cpu->cpu = CPU(dev);
> out:
> error_propagate(errp, local_err);
> --
> 1.8.3.1
>
--
Eduardo
- [Qemu-devel] [PATCH 00/11] pc: allow to use -device/device_add for CPUs, Igor Mammedov, 2016/06/23
- [Qemu-devel] [PATCH 02/11] pc: add x86_topo_ids_from_apicid(), Igor Mammedov, 2016/06/23
- [Qemu-devel] [PATCH 01/11] target-i386: cpu: use uint32_t for X86CPU.apic_id, Igor Mammedov, 2016/06/23
- [Qemu-devel] [PATCH 03/11] pc: extract CPU lookup into a separate function, Igor Mammedov, 2016/06/23
- Re: [Qemu-devel] [PATCH 03/11] pc: extract CPU lookup into a separate function,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 04/11] pc: cpu: consolidate apic-id validity checks in pc_cpu_pre_plug(), Igor Mammedov, 2016/06/23
- [Qemu-devel] [PATCH 07/11] pc: set APIC ID based on socket/core/thread ids if it's not been set yet, Igor Mammedov, 2016/06/23
[Qemu-devel] [PATCH 05/11] target-i386: cpu: replace custom apic-id setter/getter with static property, Igor Mammedov, 2016/06/23