mirror of
https://github.com/qemu/qemu.git
synced 2026-10-03 19:58:12 +00:00
7aa563630b
For compatibility reasons PC/Q35 will start with legacy CPU hotplug
interface by default but with new CPU hotplug AML code since 2.7
machine type (in commit 679dd1a957 ("pc: use new CPU hotplug interface
since 2.7 machine type")). In that way, legacy firmware that doesn't use
QEMU generated ACPI tables was able to continue using legacy CPU hotplug
interface.
While later machine types, with firmware supporting QEMU provided ACPI
tables, generate new CPU hotplug AML, which will switch to new CPU
hotplug interface when guest OS executes its _INI method on ACPI tables
loading.
Since 2.6 machine type is now gone, and consider that the legacy BIOS
(based on QEMU ACPI prior to v2.7) should be no longer in use, previous
compatibility requirements are no longer necessary. So initialize
'modern' hotplug directly from the very beginning for PC/Q35 machines
with cpu_hotplug_hw_init(), and drop _INIT method.
Additionally, remove the checks and settings around cpu_hotplug_legacy
in cpuhp VMState (for piix4 & ich9), to eliminate the risk of
segmentation faults, as gpe_cpu no longer has the opportunity to be
initialized. This is safe because all hotplug now start with the modern
way, and it's impossible to switch to legacy way at runtime (even the
"cpu-hotplug-legacy" properties does not allow it either).
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Acked-by: Igor Mammedov <imammedo@redhat.com>
Link: https://lore.kernel.org/r/20260108033051.777361-4-zhao1.liu@intel.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
78 lines
2.2 KiB
C
78 lines
2.2 KiB
C
/*
|
|
* QEMU ACPI hotplug utilities
|
|
*
|
|
* Copyright (C) 2016 Red Hat Inc
|
|
*
|
|
* Authors:
|
|
* Igor Mammedov <imammedo@redhat.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*/
|
|
#ifndef ACPI_CPU_H
|
|
#define ACPI_CPU_H
|
|
|
|
#include "qapi/qapi-types-acpi.h"
|
|
#include "hw/core/qdev.h"
|
|
#include "hw/acpi/acpi.h"
|
|
#include "hw/acpi/aml-build.h"
|
|
#include "hw/core/boards.h"
|
|
#include "hw/core/hotplug.h"
|
|
|
|
#define ACPI_CPU_HOTPLUG_REG_LEN 12
|
|
|
|
typedef struct AcpiCpuStatus {
|
|
CPUState *cpu;
|
|
uint64_t arch_id;
|
|
bool is_inserting;
|
|
bool is_removing;
|
|
bool fw_remove;
|
|
uint32_t ost_event;
|
|
uint32_t ost_status;
|
|
} AcpiCpuStatus;
|
|
|
|
typedef struct CPUHotplugState {
|
|
MemoryRegion ctrl_reg;
|
|
uint32_t selector;
|
|
uint8_t command;
|
|
uint32_t dev_count;
|
|
AcpiCpuStatus *devs;
|
|
} CPUHotplugState;
|
|
|
|
void acpi_cpu_plug_cb(HotplugHandler *hotplug_dev,
|
|
CPUHotplugState *cpu_st, DeviceState *dev, Error **errp);
|
|
|
|
void acpi_cpu_unplug_request_cb(HotplugHandler *hotplug_dev,
|
|
CPUHotplugState *cpu_st,
|
|
DeviceState *dev, Error **errp);
|
|
|
|
void acpi_cpu_unplug_cb(CPUHotplugState *cpu_st,
|
|
DeviceState *dev, Error **errp);
|
|
|
|
void cpu_hotplug_hw_init(MemoryRegion *as, Object *owner,
|
|
CPUHotplugState *state, hwaddr base_addr);
|
|
|
|
typedef struct CPUHotplugFeatures {
|
|
bool acpi_1_compatible;
|
|
bool fw_unplugs_cpu;
|
|
const char *smi_path;
|
|
} CPUHotplugFeatures;
|
|
|
|
typedef void (*build_madt_cpu_fn)(int uid, const CPUArchIdList *apic_ids,
|
|
GArray *entry, bool force_enabled);
|
|
|
|
void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts,
|
|
build_madt_cpu_fn build_madt_cpu, hwaddr base_addr,
|
|
const char *res_root,
|
|
const char *event_handler_method,
|
|
AmlRegionSpace rs);
|
|
|
|
void acpi_cpu_ospm_status(CPUHotplugState *cpu_st, ACPIOSTInfoList ***list);
|
|
|
|
extern const VMStateDescription vmstate_cpu_hotplug;
|
|
#define VMSTATE_CPU_HOTPLUG(cpuhp, state) \
|
|
VMSTATE_STRUCT(cpuhp, state, 1, \
|
|
vmstate_cpu_hotplug, CPUHotplugState)
|
|
|
|
#endif
|