Commit 0445259b authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Paolo Bonzini
Browse files

acpi: move declarations from pc.h to acpi.h 



Functions defined in acpi/ should be declared in
acpi.h

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 174d5d99

arch_init.c

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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

+7 −0
Original line number Diff line number Diff line
@@ -154,4 +154,11 @@ 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_add(const QemuOpts *opts, Error **errp);



#endif /* !QEMU_HW_ACPI_H */

include/hw/i386/pc.h

+0 −8
Original line number Diff line number Diff line
@@ -107,14 +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_add(const QemuOpts *opts, Error **errp);



/* acpi_piix.c */



i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,