From patchwork Mon Apr 15 09:37:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 236545 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1E77B2C00DD for ; Mon, 15 Apr 2013 19:38:16 +1000 (EST) Received: from localhost ([::1]:46398 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URfra-000377-9j for incoming@patchwork.ozlabs.org; Mon, 15 Apr 2013 05:38:14 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39096) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URfr8-00036A-Kr for qemu-devel@nongnu.org; Mon, 15 Apr 2013 05:37:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URfr5-0002lT-Jj for qemu-devel@nongnu.org; Mon, 15 Apr 2013 05:37:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50474) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URfr5-0002lI-BU for qemu-devel@nongnu.org; Mon, 15 Apr 2013 05:37:43 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3F9bg0G016070 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 15 Apr 2013 05:37:42 -0400 Received: from redhat.com (vpn1-6-102.ams2.redhat.com [10.36.6.102]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id r3F9bfOR021272 for ; Mon, 15 Apr 2013 05:37:41 -0400 Date: Mon, 15 Apr 2013 12:37:40 +0300 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <5899f1a3f5671520e17a6a3779c6defa5ae4a6e9.1366018642.git.mst@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/3] acpi: move declarations from pc.h to acpi.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Functions defined in acpi/ should be declared in acpi.h Signed-off-by: Michael S. Tsirkin --- 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 | 8 -------- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/arch_init.c b/arch_init.c index 769ce77..fba0889 100644 --- a/arch_init.c +++ b/arch_init.c @@ -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, ...) \ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 8d75b34..0d6e72b 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -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 diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index cff8013..943758a 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -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 diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h index e18ef28..80e955d 100644 --- a/include/hw/acpi/acpi.h +++ b/include/hw/acpi/acpi.h @@ -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 */ diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 5d40914..9bcc819 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,