acpi: move declarations from pc.h to acpi.h
PATCH 1/1 acpi: move declarations from pc.h to acpi.h
Functions defined in acpi/ should be declared inacpi.h
Signed-off-by Michael S. Tsirkin <[email protected]>
--- arch_init.c | 1 + hw/i386/pc.c | 1 + hw/i386/pc_piix.c | 1 + include/hw/acpi/acpi.h | 10 ++++++++++ include/hw/i386/pc.h | 11 ----------- 5 files changed, 13 insertions(+), 11 deletions(-)
arch_init.c +1 -0
@@ -49,6 +49,7 @@#include "qmp-commands.h" #include "trace.h" #include "exec/cpu-all.h" +#include "hw/acpi/acpi.h" #ifdef DEBUG_ARCH_INIT #define DPRINTF (fmt, ...) \
hw/i386/pc.c +1 -0
@@ -52,6 +52,7 @@#include "sysemu/arch_init.h" #include "qemu/bitmap.h" #include "qemu/config-file.h" +#include "hw/acpi/acpi.h" /* debug PC/ISA interrupts */ //#define DEBUG_IRQ
hw/i386/pc_piix.c +1 -0
@@ -43,6 +43,7 @@#include "hw/xen/xen.h" #include "exec/memory.h" #include "exec/address-spaces.h" +#include "hw/acpi/acpi.h" #include "cpu.h" #ifdef CONFIG_XEN # include <xen/hvm/hvm_info_table.h>
include/hw/acpi/acpi.h +10 -0
@@ -154,4 +154,14 @@ void acpi_gpe_reset(ACPIREGS *ar);void acpi_gpe_ioport_writeb (ACPIREGS *ar,uint32_t addr,uint32_t val);uint32_t acpi_gpe_ioport_readb (ACPIREGS *ar,uint32_t addr); +/* acpi.c */ +extern int acpi_enabled; +extern char unsigned *acpi_tables; +extern size_t acpi_tables_len; + +void acpi_table_install (const char unsigned *blob,size_t bloblen, +bool has_header,const struct AcpiTableOptions *hdrs, +Error **errp); +void acpi_table_add (const QemuOpts *opts,Error **errp); +#endif /* !QEMU_HW_ACPI_H */
include/hw/i386/pc.h +0 -11
@@ -107,17 +107,6 @@ void cpu_smm_register(cpu_set_smm_t callback, void *arg);void ioapic_init_gsi (GSIState *gsi_state,const char *parent_name); -/* acpi.c */ -extern int acpi_enabled; -extern char unsigned *acpi_tables; -extern size_t acpi_tables_len; - -void acpi_bios_init (void ); -void acpi_table_install (const char unsigned *blob,size_t bloblen, -bool has_header,const struct AcpiTableOptions *hdrs, -Error **errp); -void acpi_table_add (const QemuOpts *opts,Error **errp); -/* acpi_piix.c */ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
Signature · 1 line
MST
Il 15/04/2013 08:19, Michael S. Tsirkin ha scritto:
Quoted 4 lines
Functions defined in acpi/ should be declared in
acpi.hSigned-off-by Michael S. Tsirkin <[email protected]>
Thanks, I'll include it in the pull request.
Paolo