mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/acpi/acpi_dev_interface: Remove unused parameter from AcpiDeviceIfClass::madt_cpu

Browse Source 
The only function ever assigned to AcpiDeviceIfClass::madt_cpu is
pc_madt_cpu_entry() which doesn't use the AcpiDeviceIf parameter.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20230121151941.24120-5-shentey@gmail.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Bernhard Beschow 2023-01-21 16:19:38 +01:00 committed by Michael S. Tsirkin
parent edfa718010
commit d395b18dce
5 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/acpi/acpi-x86-stub.c
View File

@ -2,9 +2,8 @@
#include "hw/i386/pc.h" #include "hw/i386/pc.h"
#include "hw/i386/acpi-build.h" #include "hw/i386/acpi-build.h"
void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids,
const CPUArchIdList *apic_ids, GArray *entry, GArray *entry, bool force_enabled)
bool force_enabled)
{ {
} }

3
hw/acpi/cpu.c
View File

@ -355,7 +355,6 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts,
char *cphp_res_path = g_strdup_printf("%s." CPUHP_RES_DEVICE, res_root); char *cphp_res_path = g_strdup_printf("%s." CPUHP_RES_DEVICE, res_root);
Object *obj = object_resolve_path_type("", TYPE_ACPI_DEVICE_IF, NULL); Object *obj = object_resolve_path_type("", TYPE_ACPI_DEVICE_IF, NULL);
AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_GET_CLASS(obj); AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_GET_CLASS(obj);
AcpiDeviceIf *adev = ACPI_DEVICE_IF(obj);
cpu_ctrl_dev = aml_device("%s", cphp_res_path); cpu_ctrl_dev = aml_device("%s", cphp_res_path);
{ {
@ -666,7 +665,7 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts,
/* build _MAT object */ /* build _MAT object */
assert(adevc && adevc->madt_cpu); assert(adevc && adevc->madt_cpu);
adevc->madt_cpu(adev, i, arch_ids, madt_buf, adevc->madt_cpu(i, arch_ids, madt_buf,
true); /* set enabled flag */ true); /* set enabled flag */
aml_append(dev, aml_name_decl("_MAT", aml_append(dev, aml_name_decl("_MAT",
aml_buffer(madt_buf->len, (uint8_t *)madt_buf->data))); aml_buffer(madt_buf->len, (uint8_t *)madt_buf->data)));

7
hw/i386/acpi-common.c
View File

@ -33,9 +33,8 @@
#include "acpi-build.h" #include "acpi-build.h"
#include "acpi-common.h" #include "acpi-common.h"
void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids,
const CPUArchIdList *apic_ids, GArray *entry, GArray *entry, bool force_enabled)
bool force_enabled)
{ {
uint32_t apic_id = apic_ids->cpus[uid].arch_id; uint32_t apic_id = apic_ids->cpus[uid].arch_id;
/* Flags – Local APIC Flags */ /* Flags – Local APIC Flags */
@ -112,7 +111,7 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker,
build_append_int_noprefix(table_data, 1 /* PCAT_COMPAT */, 4); /* Flags */ build_append_int_noprefix(table_data, 1 /* PCAT_COMPAT */, 4); /* Flags */
for (i = 0; i < apic_ids->len; i++) { for (i = 0; i < apic_ids->len; i++) {
adevc->madt_cpu(adev, i, apic_ids, table_data, false); adevc->madt_cpu(i, apic_ids, table_data, false);
if (apic_ids->cpus[i].arch_id > 254) { if (apic_ids->cpus[i].arch_id > 254) {
x2apic_mode = true; x2apic_mode = true;
} }

3
include/hw/acpi/acpi_dev_interface.h
View File

@ -52,8 +52,7 @@ struct AcpiDeviceIfClass {
/* <public> */ /* <public> */
void (*ospm_status)(AcpiDeviceIf *adev, ACPIOSTInfoList ***list); void (*ospm_status)(AcpiDeviceIf *adev, ACPIOSTInfoList ***list);
void (*send_event)(AcpiDeviceIf *adev, AcpiEventStatusBits ev); void (*send_event)(AcpiDeviceIf *adev, AcpiEventStatusBits ev);
void (*madt_cpu)(AcpiDeviceIf *adev, int uid, void (*madt_cpu)(int uid, const CPUArchIdList *apic_ids, GArray *entry,
const CPUArchIdList *apic_ids, GArray *entry,
bool force_enabled); bool force_enabled);
}; };
#endif #endif

6
include/hw/i386/pc.h
View File

@ -9,7 +9,6 @@
#include "hw/block/flash.h" #include "hw/block/flash.h"
#include "hw/i386/x86.h" #include "hw/i386/x86.h"
#include "hw/acpi/acpi_dev_interface.h"
#include "hw/hotplug.h" #include "hw/hotplug.h"
#include "qom/object.h" #include "qom/object.h"
#include "hw/i386/sgx-epc.h" #include "hw/i386/sgx-epc.h"
@ -193,9 +192,8 @@ bool pc_system_ovmf_table_find(const char *entry, uint8_t **data,
void pc_system_parse_ovmf_flash(uint8_t *flash_ptr, size_t flash_size); void pc_system_parse_ovmf_flash(uint8_t *flash_ptr, size_t flash_size);
/* hw/i386/acpi-common.c */ /* hw/i386/acpi-common.c */
void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids,
const CPUArchIdList *apic_ids, GArray *entry, GArray *entry, bool force_enabled);
bool force_enabled);
/* sgx.c */ /* sgx.c */
void pc_machine_init_sgx_epc(PCMachineState *pcms); void pc_machine_init_sgx_epc(PCMachineState *pcms);