david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2013-04-15 09:19:22 +03:00 committed by Paolo Bonzini
parent 174d5d990c
commit 0445259ba6
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch_init.c
View File

@ -49,6 +49,7 @@
#include "qmp-commands.h" #include "qmp-commands.h"
#include "trace.h" #include "trace.h"
#include "exec/cpu-all.h" #include "exec/cpu-all.h"
#include "hw/acpi/acpi.h"
#ifdef DEBUG_ARCH_INIT #ifdef DEBUG_ARCH_INIT
#define DPRINTF(fmt, ...) \ #define DPRINTF(fmt, ...) \

1
hw/i386/pc.c
View File

@ -52,6 +52,7 @@
#include "sysemu/arch_init.h" #include "sysemu/arch_init.h"
#include "qemu/bitmap.h" #include "qemu/bitmap.h"
#include "qemu/config-file.h" #include "qemu/config-file.h"
#include "hw/acpi/acpi.h"
/* debug PC/ISA interrupts */ /* debug PC/ISA interrupts */
//#define DEBUG_IRQ //#define DEBUG_IRQ

1
hw/i386/pc_piix.c
View File

@ -43,6 +43,7 @@
#include "hw/xen/xen.h" #include "hw/xen/xen.h"
#include "exec/memory.h" #include "exec/memory.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "hw/acpi/acpi.h"
#include "cpu.h" #include "cpu.h"
#ifdef CONFIG_XEN #ifdef CONFIG_XEN
# include <xen/hvm/hvm_info_table.h> # include <xen/hvm/hvm_info_table.h>

7
include/hw/acpi/acpi.h
View File

@ -154,4 +154,11 @@ void acpi_gpe_reset(ACPIREGS *ar);
void acpi_gpe_ioport_writeb(ACPIREGS *ar, uint32_t addr, uint32_t val); void acpi_gpe_ioport_writeb(ACPIREGS *ar, uint32_t addr, uint32_t val);
uint32_t acpi_gpe_ioport_readb(ACPIREGS *ar, uint32_t addr); 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 */ #endif /* !QEMU_HW_ACPI_H */

8
include/hw/i386/pc.h
View File

@ -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); 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 */ /* acpi_piix.c */
i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,