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

hw/acpi/acpi_dev_interface: Remove now unused madt_cpu virtual method

Browse Source 
This virtual method was always set to the x86-specific pc_madt_cpu_entry(),
even in piix4 which is also used in MIPS. The previous changes use
pc_madt_cpu_entry() otherwise, so madt_cpu can be dropped.

Since pc_madt_cpu_entry() is now only used in x86-specific code, the stub
in hw/acpi/acpi-x86-stub can be removed as well.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230908084234.17642-4-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-09-08 10:42:29 +02:00 committed by Michael S. Tsirkin
parent 9a4fedcf12
commit c461f3e382
5 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,6 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/i386/pc.h"
#include "hw/i386/acpi-build.h" #include "hw/i386/acpi-build.h"
void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids,
GArray *entry, bool force_enabled)
{
}
Object *acpi_get_i386_pci_host(void) Object *acpi_get_i386_pci_host(void)
{ {
return NULL; return NULL;

2
hw/acpi/piix4.c
View File

@ -20,7 +20,6 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/i386/pc.h"
#include "hw/irq.h" #include "hw/irq.h"
#include "hw/isa/apm.h" #include "hw/isa/apm.h"
#include "hw/i2c/pm_smbus.h" #include "hw/i2c/pm_smbus.h"
@ -654,7 +653,6 @@ static void piix4_pm_class_init(ObjectClass *klass, void *data)
hc->is_hotpluggable_bus = piix4_is_hotpluggable_bus; hc->is_hotpluggable_bus = piix4_is_hotpluggable_bus;
adevc->ospm_status = piix4_ospm_status; adevc->ospm_status = piix4_ospm_status;
adevc->send_event = piix4_send_gpe; adevc->send_event = piix4_send_gpe;
adevc->madt_cpu = pc_madt_cpu_entry;
} }
static const TypeInfo piix4_pm_info = { static const TypeInfo piix4_pm_info = {

9
hw/i386/generic_event_device_x86.c
View File

@ -8,19 +8,10 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/acpi/generic_event_device.h" #include "hw/acpi/generic_event_device.h"
#include "hw/i386/pc.h"
static void acpi_ged_x86_class_init(ObjectClass *class, void *data)
{
AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_CLASS(class);
adevc->madt_cpu = pc_madt_cpu_entry;
}
static const TypeInfo acpi_ged_x86_info = { static const TypeInfo acpi_ged_x86_info = {
.name = TYPE_ACPI_GED_X86, .name = TYPE_ACPI_GED_X86,
.parent = TYPE_ACPI_GED, .parent = TYPE_ACPI_GED,
.class_init = acpi_ged_x86_class_init,
.interfaces = (InterfaceInfo[]) { .interfaces = (InterfaceInfo[]) {
{ TYPE_HOTPLUG_HANDLER }, { TYPE_HOTPLUG_HANDLER },
{ TYPE_ACPI_DEVICE_IF }, { TYPE_ACPI_DEVICE_IF },

1
hw/isa/lpc_ich9.c
View File

@ -891,7 +891,6 @@ static void ich9_lpc_class_init(ObjectClass *klass, void *data)
hc->is_hotpluggable_bus = ich9_pm_is_hotpluggable_bus; hc->is_hotpluggable_bus = ich9_pm_is_hotpluggable_bus;
adevc->ospm_status = ich9_pm_ospm_status; adevc->ospm_status = ich9_pm_ospm_status;
adevc->send_event = ich9_send_gpe; adevc->send_event = ich9_send_gpe;
adevc->madt_cpu = pc_madt_cpu_entry;
amldevc->build_dev_aml = build_ich9_isa_aml; amldevc->build_dev_aml = build_ich9_isa_aml;
} }

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

@ -52,7 +52,5 @@ 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)(int uid, const CPUArchIdList *apic_ids, GArray *entry,
bool force_enabled);
}; };
#endif #endif