c025e9059a
- coro: support live patch for libcare
- tests/acpi: Update expected ACPI tables for vcpu hotplug(update BinDir)
- arm/virt: Require mc->has_hotpluggable_cpus for cold-plugged vcpu
- arm/virt: Consider has_ged when set mc->has_hotpluggable_cpus
- arm/virt-acpi: Require possible_cpu_arch_ids for build_cpus_aml()
- acpi/ged: Remove cpuhp field of ged
- acpi/ged: Init cpu hotplug only when machine support it
- intc/gicv3: Fixes for vcpu hotplug
- arm/kvm: Set psci smccc filter only with vcpu hotplug
- accel/kvm: Use correct id for parked vcpu
- arm/virt: Fix adjudgement of core_id for vcpu hotplugged
- arm/virt.c: Convey local_err when set psci-conduit
- system/cpus: Fix resume_all_vcpus() under vCPU hotplug condition
- system/cpus: Fix pause_all_vcpus() under concurrent environment
- acpi/cpu: Fix cpu_hotplug_hw_init()
- arm/cpu: Some fixes for arm_cpu_unrealizefn()
- system/physmem: Fix possible double free when destroy cpu as
- hw/arm/virt: Expose cold-booted CPUs as MADT GICC Enabled
- tcg/mttcg: enable threads to unregister in tcg_ctxs[]
- hw/arm: Support hotplug capability check using _OSC method
- target/arm/kvm,tcg: Register/Handle SMCCC hypercall exits to VMM/Qemu
- target/arm/kvm: Write CPU state back to KVM on reset
- target/arm: Add support of *unrealize* ARMCPU during vCPU Hot-unplug
- physmem,gdbstub: Common helping funcs/changes to *unrealize* vCPU
- hw/arm: Changes required for reset and to support next boot
- arm/virt: Update the guest(via GED) about CPU hot-(un)plug events
- hw/intc/arm-gicv3*: Changes required to (re)init the vCPU register info
- hw/arm,gicv3: Changes to update GIC with vCPU hot-plug notification
- arm/virt: Changes to (un)wire GICC<->vCPU IRQs during hot-(un)plug
- arm/virt: Add/update basic hot-(un)plug framework
- hw/acpi: Update ACPI GED framework to support vCPU Hotplug
- arm/virt: Release objects for *disabled* possible vCPUs after init
- hw/acpi: Make _MAT method optional
- hw/arm: MADT Tbl change to size the guest with possible vCPUs
- hw/acpi: Update GED _EVT method AML with cpu scan
- hw/acpi: ACPI/AML Changes to reflect the correct _STA.{PRES,ENA} Bits to Guest
- arm/virt: Make ARM vCPU *present* status ACPI *persistent*
- arm/virt/acpi: Build CPUs AML with CPU Hotplug support
- tests/acpi/bios-tables-test: Allow changes to virt/DSDT file
- acpi/cpu: Add cpu_cppc building support
- arm/virt/acpi: Factor out CPPC building from DSDT CPU aml
- hw/acpi: Update CPUs AML with cpu-(ctrl)dev change
- arm/virt: Create GED dev before *disabled* CPU Objs are destroyed
- arm/virt: Add cpu hotplug events to GED during creation
- hw/acpi: Init GED framework with cpu hotplug events
- hw/acpi: Use qemu_present_cpu() API in ACPI CPU hotplug init
- hw/acpi: Add ACPI CPU hotplug init stub
- arm/acpi: Enable ACPI support for vcpu hotplug
- hw/acpi: Move CPU ctrl-dev MMIO region len macro to common header file
- arm/virt: Init PMU at host for all possible vcpus
- arm/virt,gicv3: Changes to pre-size GIC with possible vcpus @machine init
- arm/virt,kvm: Pre-create disabled possible vCPUs @machine init
- accel/kvm: Extract common KVM vCPU {creation,parking} code
- arm/virt,target/arm: Machine init time change common to vCPU {cold|hot}-plug
- hw/arm/virt: Move setting of common CPU properties in a function
- cpus-common: Add common CPU utility for possible vCPUs
- arm/virt,target/arm: Add new ARMCPU {socket,cluster,core,thread}-id property
Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
74 lines
2.5 KiB
Diff
74 lines
2.5 KiB
Diff
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
|
|
|