Projects
home:dongzhihai
qemu
_service:tar_scm:arm-virt-Consider-has_ged-when...
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File _service:tar_scm:arm-virt-Consider-has_ged-when-set-mc-has_hotpluggab.patch of Package qemu
From baa26f2fc075522f91c3e9a332fc4fa3f3b167bf Mon Sep 17 00:00:00 2001 From: Keqian Zhu <zhukeqian1@huawei.com> Date: Tue, 26 Mar 2024 22:55:49 +0800 Subject: [PATCH] arm/virt: Consider has_ged when set mc->has_hotpluggable_cpus Vcpu hotplug relies on ged device. Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com> --- hw/arm/virt.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 38b5d214a1..00e57f2d75 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2357,6 +2357,7 @@ static void machvirt_init(MachineState *machine) bool has_ged = !vmc->no_ged; unsigned int smp_cpus = machine->smp.cpus; unsigned int max_cpus = machine->smp.max_cpus; + ObjectClass *cpu_class; if (!cpu_type_valid(machine->cpu_type)) { error_report("mach-virt: CPU type %s not supported", machine->cpu_type); @@ -2364,14 +2365,6 @@ static void machvirt_init(MachineState *machine) } finalize_gic_version(vms); - if (tcg_enabled() || hvf_enabled() || qtest_enabled() || - (vms->gic_version < VIRT_GIC_VERSION_3)) { - mc->has_hotpluggable_cpus = false; - } - if (!mc->has_hotpluggable_cpus) { - machine->smp.max_cpus = smp_cpus; - warn_report("cpu hotplug feature has been disabled"); - } possible_cpus = mc->possible_cpu_arch_ids(machine); @@ -2501,6 +2494,21 @@ static void machvirt_init(MachineState *machine) create_fdt(vms); qemu_log("cpu init start\n"); + cpu_class = object_class_by_name(machine->cpu_type); + has_ged = has_ged && firmware_loaded && + virt_is_acpi_enabled(vms) && + !!object_class_dynamic_cast(cpu_class, TYPE_AARCH64_CPU); + if (tcg_enabled() || hvf_enabled() || qtest_enabled() || + (vms->gic_version < VIRT_GIC_VERSION_3) || !has_ged) { + mc->has_hotpluggable_cpus = false; + } + if (!mc->has_hotpluggable_cpus) { + if (machine->smp.max_cpus > smp_cpus) { + warn_report("cpu hotplug feature has been disabled"); + } + machine->smp.max_cpus = smp_cpus; + } + notifier_list_init(&vms->cpuhp_notifiers); possible_cpus = mc->possible_cpu_arch_ids(machine); assert(possible_cpus->len == max_cpus); @@ -2581,8 +2589,6 @@ static void machvirt_init(MachineState *machine) create_gic(vms, sysmem); - has_ged = has_ged && aarch64 && firmware_loaded && - virt_is_acpi_enabled(vms); if (has_ged) { vms->acpi_dev = create_acpi_ged(vms); } -- 2.27.0
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2