| Message ID | 20230116152908.147275-2-shentey@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | AML Housekeeping | expand |
On Mon, 16 Jan 2023 16:29:02 +0100 Bernhard Beschow <shentey@gmail.com> wrote: > 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> > --- > include/hw/acpi/acpi_dev_interface.h | 3 +-- > include/hw/i386/pc.h | 6 ++---- > hw/acpi/acpi-x86-stub.c | 5 ++--- > hw/acpi/cpu.c | 3 +-- > hw/i386/acpi-common.c | 7 +++---- > 5 files changed, 9 insertions(+), 15 deletions(-) > > diff --git a/include/hw/acpi/acpi_dev_interface.h b/include/hw/acpi/acpi_dev_interface.h > index ea6056ab92..a1648220ff 100644 > --- a/include/hw/acpi/acpi_dev_interface.h > +++ b/include/hw/acpi/acpi_dev_interface.h > @@ -52,8 +52,7 @@ struct AcpiDeviceIfClass { > /* <public> */ > void (*ospm_status)(AcpiDeviceIf *adev, ACPIOSTInfoList ***list); > void (*send_event)(AcpiDeviceIf *adev, AcpiEventStatusBits ev); > - void (*madt_cpu)(AcpiDeviceIf *adev, int uid, > - const CPUArchIdList *apic_ids, GArray *entry, > + void (*madt_cpu)(int uid, const CPUArchIdList *apic_ids, GArray *entry, > bool force_enabled); > }; > #endif > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 991f905f5d..a0647165d1 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -9,7 +9,6 @@ > #include "hw/block/flash.h" > #include "hw/i386/x86.h" > > -#include "hw/acpi/acpi_dev_interface.h" > #include "hw/hotplug.h" > #include "qom/object.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); > > /* hw/i386/acpi-common.c */ > -void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, > - const CPUArchIdList *apic_ids, GArray *entry, > - bool force_enabled); > +void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids, > + GArray *entry, bool force_enabled); > > /* sgx.c */ > void pc_machine_init_sgx_epc(PCMachineState *pcms); > diff --git a/hw/acpi/acpi-x86-stub.c b/hw/acpi/acpi-x86-stub.c > index 3df1e090f4..d0d399d26b 100644 > --- a/hw/acpi/acpi-x86-stub.c > +++ b/hw/acpi/acpi-x86-stub.c > @@ -2,9 +2,8 @@ > #include "hw/i386/pc.h" > #include "hw/i386/acpi-build.h" > > -void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, > - const CPUArchIdList *apic_ids, GArray *entry, > - bool force_enabled) > +void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids, > + GArray *entry, bool force_enabled) > { > } > > diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c > index 4e580959a2..19c154d78f 100644 > --- a/hw/acpi/cpu.c > +++ b/hw/acpi/cpu.c > @@ -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); > Object *obj = object_resolve_path_type("", TYPE_ACPI_DEVICE_IF, NULL); > AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_GET_CLASS(obj); > - AcpiDeviceIf *adev = ACPI_DEVICE_IF(obj); > > 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 */ > 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 */ > aml_append(dev, aml_name_decl("_MAT", > aml_buffer(madt_buf->len, (uint8_t *)madt_buf->data))); > diff --git a/hw/i386/acpi-common.c b/hw/i386/acpi-common.c > index 4aaafbdd7b..52e5c1439a 100644 > --- a/hw/i386/acpi-common.c > +++ b/hw/i386/acpi-common.c > @@ -33,9 +33,8 @@ > #include "acpi-build.h" > #include "acpi-common.h" > > -void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, > - const CPUArchIdList *apic_ids, GArray *entry, > - bool force_enabled) > +void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids, > + GArray *entry, bool force_enabled) > { > uint32_t apic_id = apic_ids->cpus[uid].arch_id; > /* 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 */ > > 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) { > x2apic_mode = true; > }
diff --git a/include/hw/acpi/acpi_dev_interface.h b/include/hw/acpi/acpi_dev_interface.h index ea6056ab92..a1648220ff 100644 --- a/include/hw/acpi/acpi_dev_interface.h +++ b/include/hw/acpi/acpi_dev_interface.h @@ -52,8 +52,7 @@ struct AcpiDeviceIfClass { /* <public> */ void (*ospm_status)(AcpiDeviceIf *adev, ACPIOSTInfoList ***list); void (*send_event)(AcpiDeviceIf *adev, AcpiEventStatusBits ev); - void (*madt_cpu)(AcpiDeviceIf *adev, int uid, - const CPUArchIdList *apic_ids, GArray *entry, + void (*madt_cpu)(int uid, const CPUArchIdList *apic_ids, GArray *entry, bool force_enabled); }; #endif diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 991f905f5d..a0647165d1 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -9,7 +9,6 @@ #include "hw/block/flash.h" #include "hw/i386/x86.h" -#include "hw/acpi/acpi_dev_interface.h" #include "hw/hotplug.h" #include "qom/object.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); /* hw/i386/acpi-common.c */ -void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, - const CPUArchIdList *apic_ids, GArray *entry, - bool force_enabled); +void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids, + GArray *entry, bool force_enabled); /* sgx.c */ void pc_machine_init_sgx_epc(PCMachineState *pcms); diff --git a/hw/acpi/acpi-x86-stub.c b/hw/acpi/acpi-x86-stub.c index 3df1e090f4..d0d399d26b 100644 --- a/hw/acpi/acpi-x86-stub.c +++ b/hw/acpi/acpi-x86-stub.c @@ -2,9 +2,8 @@ #include "hw/i386/pc.h" #include "hw/i386/acpi-build.h" -void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, - const CPUArchIdList *apic_ids, GArray *entry, - bool force_enabled) +void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids, + GArray *entry, bool force_enabled) { } diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c index 4e580959a2..19c154d78f 100644 --- a/hw/acpi/cpu.c +++ b/hw/acpi/cpu.c @@ -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); Object *obj = object_resolve_path_type("", TYPE_ACPI_DEVICE_IF, NULL); AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_GET_CLASS(obj); - AcpiDeviceIf *adev = ACPI_DEVICE_IF(obj); 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 */ 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 */ aml_append(dev, aml_name_decl("_MAT", aml_buffer(madt_buf->len, (uint8_t *)madt_buf->data))); diff --git a/hw/i386/acpi-common.c b/hw/i386/acpi-common.c index 4aaafbdd7b..52e5c1439a 100644 --- a/hw/i386/acpi-common.c +++ b/hw/i386/acpi-common.c @@ -33,9 +33,8 @@ #include "acpi-build.h" #include "acpi-common.h" -void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, - const CPUArchIdList *apic_ids, GArray *entry, - bool force_enabled) +void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids, + GArray *entry, bool force_enabled) { uint32_t apic_id = apic_ids->cpus[uid].arch_id; /* 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 */ 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) { x2apic_mode = true; }
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> --- include/hw/acpi/acpi_dev_interface.h | 3 +-- include/hw/i386/pc.h | 6 ++---- hw/acpi/acpi-x86-stub.c | 5 ++--- hw/acpi/cpu.c | 3 +-- hw/i386/acpi-common.c | 7 +++---- 5 files changed, 9 insertions(+), 15 deletions(-)