Message ID | 20240219141412.71418-2-philmd@linaro.org |
---|---|
State | Superseded |
Headers | show |
Series | hw/acpi: Include missing headers | expand |
On Mon, Feb 19, 2024 at 03:14:07PM +0100, Philippe Mathieu-Daudé wrote: > Date: Mon, 19 Feb 2024 15:14:07 +0100 > From: Philippe Mathieu-Daudé <philmd@linaro.org> > Subject: [PATCH 1/5] hw/acpi: Include missing 'qapi/qapi-types-acpi.h' > generated header > X-Mailer: git-send-email 2.41.0 > > ACPIOSTInfo is a QAPI generated structure: > > $ git grep -w ACPIOSTInfo > qapi/acpi.json:81:# @ACPIOSTInfo: > qapi/acpi.json:99:{ 'struct': 'ACPIOSTInfo', > qapi/acpi.json:109:# Return a list of ACPIOSTInfo for devices that support status > > Include the "qapi/qapi-types-acpi.h" header to avoid the following > errors when including "hw/acpi/cpu.h" or "hw/acpi/memory_hotplug.h" > elsewhere: > > include/hw/acpi/cpu.h:67:52: error: unknown type name 'ACPIOSTInfoList' > void acpi_cpu_ospm_status(CPUHotplugState *cpu_st, ACPIOSTInfoList ***list); > ^ > include/hw/acpi/memory_hotplug.h:51:55: error: unknown type name 'ACPIOSTInfoList' > void acpi_memory_ospm_status(MemHotplugState *mem_st, ACPIOSTInfoList ***list); > ^ > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > include/hw/acpi/cpu.h | 1 + > include/hw/acpi/memory_hotplug.h | 1 + > 2 files changed, 2 insertions(+) Reviewed-by: Zhao Liu <zhao1.liu@intel.com> > > diff --git a/include/hw/acpi/cpu.h b/include/hw/acpi/cpu.h > index bc901660fb..e011d01adf 100644 > --- a/include/hw/acpi/cpu.h > +++ b/include/hw/acpi/cpu.h > @@ -12,6 +12,7 @@ > #ifndef ACPI_CPU_H > #define ACPI_CPU_H > > +#include "qapi/qapi-types-acpi.h" > #include "hw/qdev-core.h" > #include "hw/acpi/acpi.h" > #include "hw/acpi/aml-build.h" > diff --git a/include/hw/acpi/memory_hotplug.h b/include/hw/acpi/memory_hotplug.h > index dfe9cf3fde..38841d7b06 100644 > --- a/include/hw/acpi/memory_hotplug.h > +++ b/include/hw/acpi/memory_hotplug.h > @@ -1,6 +1,7 @@ > #ifndef QEMU_HW_ACPI_MEMORY_HOTPLUG_H > #define QEMU_HW_ACPI_MEMORY_HOTPLUG_H > > +#include "qapi/qapi-types-acpi.h" > #include "hw/qdev-core.h" > #include "hw/acpi/acpi.h" > #include "hw/acpi/aml-build.h" > -- > 2.41.0 > >
diff --git a/include/hw/acpi/cpu.h b/include/hw/acpi/cpu.h index bc901660fb..e011d01adf 100644 --- a/include/hw/acpi/cpu.h +++ b/include/hw/acpi/cpu.h @@ -12,6 +12,7 @@ #ifndef ACPI_CPU_H #define ACPI_CPU_H +#include "qapi/qapi-types-acpi.h" #include "hw/qdev-core.h" #include "hw/acpi/acpi.h" #include "hw/acpi/aml-build.h" diff --git a/include/hw/acpi/memory_hotplug.h b/include/hw/acpi/memory_hotplug.h index dfe9cf3fde..38841d7b06 100644 --- a/include/hw/acpi/memory_hotplug.h +++ b/include/hw/acpi/memory_hotplug.h @@ -1,6 +1,7 @@ #ifndef QEMU_HW_ACPI_MEMORY_HOTPLUG_H #define QEMU_HW_ACPI_MEMORY_HOTPLUG_H +#include "qapi/qapi-types-acpi.h" #include "hw/qdev-core.h" #include "hw/acpi/acpi.h" #include "hw/acpi/aml-build.h"
ACPIOSTInfo is a QAPI generated structure: $ git grep -w ACPIOSTInfo qapi/acpi.json:81:# @ACPIOSTInfo: qapi/acpi.json:99:{ 'struct': 'ACPIOSTInfo', qapi/acpi.json:109:# Return a list of ACPIOSTInfo for devices that support status Include the "qapi/qapi-types-acpi.h" header to avoid the following errors when including "hw/acpi/cpu.h" or "hw/acpi/memory_hotplug.h" elsewhere: include/hw/acpi/cpu.h:67:52: error: unknown type name 'ACPIOSTInfoList' void acpi_cpu_ospm_status(CPUHotplugState *cpu_st, ACPIOSTInfoList ***list); ^ include/hw/acpi/memory_hotplug.h:51:55: error: unknown type name 'ACPIOSTInfoList' void acpi_memory_ospm_status(MemHotplugState *mem_st, ACPIOSTInfoList ***list); ^ Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- include/hw/acpi/cpu.h | 1 + include/hw/acpi/memory_hotplug.h | 1 + 2 files changed, 2 insertions(+)