diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2013-04-15 09:19:22 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-15 15:16:34 +0200 |
| commit | 0445259ba686f9ddf395f700c7d5b1ac400a451c (patch) | |
| tree | f7bde207b666fa32ccf2ff84d6943f8582da3786 /include | |
| parent | 174d5d990c7b08e75677402a71c834b000171c94 (diff) | |
acpi: move declarations from pc.h to acpi.h
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/acpi/acpi.h | 7 | ||||
| -rw-r--r-- | include/hw/i386/pc.h | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h index e18ef28fd3..4cd52c1b36 100644 --- a/include/hw/acpi/acpi.h +++ b/include/hw/acpi/acpi.h @@ -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 */ diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 5d40914f49..9bcc8193b7 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -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, |