9a4fedcf12
build_cpus_aml() is architecture independent but needs to create architecture- specific CPU AML. So far this was achieved by using a virtual method from TYPE_ACPI_DEVICE_IF. However, build_cpus_aml() would resolve this interface from global (!) state. This makes it quite incomprehensible where this interface comes from (TYPE_PIIX4_PM?, TYPE_ICH9_LPC_DEVICE?, TYPE_ACPI_GED_X86?) an can lead to crashes when the generic code is ported to new architectures. So far, build_cpus_aml() is only called in architecture-specific code -- and only in x86. We can therefore simply pass pc_madt_cpu_entry() as callback to build_cpus_aml(). This is the same callback that would be used through TYPE_ACPI_DEVICE_IF. Signed-off-by: Bernhard Beschow <shentey@gmail.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-Id: <20230908084234.17642-3-shentey@gmail.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
75 lines
2.2 KiB
C
75 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 "hw/qdev-core.h"
|
|
#include "hw/acpi/acpi.h"
|
|
#include "hw/acpi/aml-build.h"
|
|
#include "hw/boards.h"
|
|
#include "hw/hotplug.h"
|
|
|
|
typedef struct AcpiCpuStatus {
|
|
struct 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 has_legacy_cphp;
|
|
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 io_base,
|
|
const char *res_root,
|
|
const char *event_handler_method);
|
|
|
|
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
|