[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 10/19] pc: register created initial and hotpl
From: |
Bandan Das |
Subject: |
Re: [Qemu-devel] [PATCH v3 10/19] pc: register created initial and hotpluged CPUs in one place pc_cpu_plug() |
Date: |
Wed, 13 Jul 2016 18:32:27 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) |
Igor Mammedov <address@hidden> writes:
> consolidate possible_cpus array management in pc_cpu_plug()
> for smp_cpus, coldplugged with -device and hotplugged with
> device_add.
So, this takes care of the hotplug case and 09/19 took care of the
coldplug case, right ? If yes, we should probably modify this commit
message a little.
Bandan
> Signed-off-by: Igor Mammedov <address@hidden>
> ---
> hw/i386/pc.c | 25 +++++++++----------------
> 1 file changed, 9 insertions(+), 16 deletions(-)
>
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 3206572..0f85b56 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1142,7 +1142,6 @@ void pc_cpus_init(PCMachineState *pcms)
> if (i < smp_cpus) {
> cpu = pc_new_cpu(typename, x86_cpu_apic_id_from_index(i),
> &error_fatal);
> - pcms->possible_cpus->cpus[i].cpu = CPU(cpu);
> object_unref(OBJECT(cpu));
> }
> }
> @@ -1697,25 +1696,19 @@ static void pc_cpu_plug(HotplugHandler *hotplug_dev,
> Error *local_err = NULL;
> PCMachineState *pcms = PC_MACHINE(hotplug_dev);
>
> - if (!dev->hotplugged) {
> - goto out;
> - }
> -
> - if (!pcms->acpi_dev) {
> - error_setg(&local_err,
> - "cpu hotplug is not enabled: missing acpi device");
> - goto out;
> + if (pcms->acpi_dev) {
> + hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev);
> + hhc->plug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err);
> + if (local_err) {
> + goto out;
> + }
> }
>
> - hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev);
> - hhc->plug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err);
> - if (local_err) {
> - goto out;
> + if (dev->hotplugged) {
> + /* increment the number of CPUs */
> + rtc_set_memory(pcms->rtc, 0x5f, rtc_get_memory(pcms->rtc, 0x5f) + 1);
> }
>
> - /* increment the number of CPUs */
> - rtc_set_memory(pcms->rtc, 0x5f, rtc_get_memory(pcms->rtc, 0x5f) + 1);
> -
> found_cpu = pc_find_cpu_slot(pcms, CPU(dev), NULL);
> found_cpu->cpu = CPU(dev);
> out:
- [Qemu-devel] [PATCH v3 09/19] pc: delay setting number of boot CPUs to machine_done time, (continued)
[Qemu-devel] [PATCH v3 10/19] pc: register created initial and hotpluged CPUs in one place pc_cpu_plug(), Igor Mammedov, 2016/07/06
- Re: [Qemu-devel] [PATCH v3 10/19] pc: register created initial and hotpluged CPUs in one place pc_cpu_plug(),
Bandan Das <=
- Re: [Qemu-devel] [PATCH v3 10/19] pc: register created initial and hotpluged CPUs in one place pc_cpu_plug(), Eduardo Habkost, 2016/07/13
- Re: [Qemu-devel] [PATCH v3 10/19] pc: register created initial and hotpluged CPUs in one place pc_cpu_plug(), Bandan Das, 2016/07/13
- Re: [Qemu-devel] [PATCH v3 10/19] pc: register created initial and hotpluged CPUs in one place pc_cpu_plug(), Eduardo Habkost, 2016/07/13
- Re: [Qemu-devel] [PATCH v3 10/19] pc: register created initial and hotpluged CPUs in one place pc_cpu_plug(), Bandan Das, 2016/07/13
- Re: [Qemu-devel] [PATCH v3 10/19] pc: register created initial and hotpluged CPUs in one place pc_cpu_plug(), Igor Mammedov, 2016/07/14
- Re: [Qemu-devel] [PATCH v3 10/19] pc: register created initial and hotpluged CPUs in one place pc_cpu_plug(), Eduardo Habkost, 2016/07/14
- Re: [Qemu-devel] [PATCH v3 10/19] pc: register created initial and hotpluged CPUs in one place pc_cpu_plug(), Igor Mammedov, 2016/07/14
- Re: [Qemu-devel] [PATCH v3 10/19] pc: register created initial and hotpluged CPUs in one place pc_cpu_plug(), Eduardo Habkost, 2016/07/14
- Re: [Qemu-devel] [PATCH v3 10/19] pc: register created initial and hotpluged CPUs in one place pc_cpu_plug(), Igor Mammedov, 2016/07/14
[Qemu-devel] [PATCH v3 11/19] pc: cpu: allow device_add to be used with x86 cpu, Igor Mammedov, 2016/07/06