On 1/21/25 03:40, Philippe Mathieu-Daudé wrote:
> CpuState caches its CPUClass since commit 6fbdff87062
> ("cpu: cache CPUClass in CPUState for hot code paths"),
> use it.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> hw/acpi/cpu.c | 4 ++--
> hw/acpi/cpu_hotplug.c | 3 +--
> 2 files changed, 3 insertions(+), 4 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
>
> diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c
> index f70a2c045e1..6f1ae79edbf 100644
> --- a/hw/acpi/cpu.c
> +++ b/hw/acpi/cpu.c
> @@ -235,8 +235,8 @@ void cpu_hotplug_hw_init(MemoryRegion *as, Object *owner,
>
> static AcpiCpuStatus *get_cpu_status(CPUHotplugState *cpu_st, DeviceState *dev)
> {
> - CPUClass *k = CPU_GET_CLASS(dev);
> - uint64_t cpu_arch_id = k->get_arch_id(CPU(dev));
> + CPUState *cpu = CPU(dev);
> + uint64_t cpu_arch_id = cpu->cc->get_arch_id(cpu);
> int i;
>
> for (i = 0; i < cpu_st->dev_count; i++) {
> diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c
> index 83b8bc5deb8..aa0e1e3efa5 100644
> --- a/hw/acpi/cpu_hotplug.c
> +++ b/hw/acpi/cpu_hotplug.c
> @@ -62,10 +62,9 @@ static const MemoryRegionOps AcpiCpuHotplug_ops = {
> static void acpi_set_cpu_present_bit(AcpiCpuHotplug *g, CPUState *cpu,
> bool *swtchd_to_modern)
> {
> - CPUClass *k = CPU_GET_CLASS(cpu);
> int64_t cpu_id;
>
> - cpu_id = k->get_arch_id(cpu);
> + cpu_id = cpu->cc->get_arch_id(cpu);
> if ((cpu_id / 8) >= ACPI_GPE_PROC_LEN) {
> object_property_set_bool(g->device, "cpu-hotplug-legacy", false,
> &error_abort);