From patchwork Mon Apr 15 13:19:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 236608 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 39F412C00DA for ; Mon, 15 Apr 2013 23:30:23 +1000 (EST) Received: from localhost ([::1]:33185 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URjUD-0003Ka-DQ for incoming@patchwork.ozlabs.org; Mon, 15 Apr 2013 09:30:21 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33729) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URjSR-0000mF-7V for qemu-devel@nongnu.org; Mon, 15 Apr 2013 09:28:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URjSP-0005Fx-QT for qemu-devel@nongnu.org; Mon, 15 Apr 2013 09:28:31 -0400 Received: from mail-bk0-x235.google.com ([2a00:1450:4008:c01::235]:63883) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URjK2-0001Pk-Dj for qemu-devel@nongnu.org; Mon, 15 Apr 2013 09:19:50 -0400 Received: by mail-bk0-f53.google.com with SMTP id e19so2330961bku.40 for ; Mon, 15 Apr 2013 06:19:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=3yfSqpU/M3gzUVlq782j//HBytgKN2Hfv5ykwXfc1Jg=; b=dkhnstNzsG/hMVgsocmoGlX/c7ZAC5FTlSWaEKmIzUFXyg9PUlgknoHmmvXwm4r7KS FTRndYmeGmh8XpFqu5k/shLPfno+K4LVmjrtuvh0W8yFx9UUiYFtCwnymqWsxYSMF6M1 dzMRtjDWJqnhHzgMjAkj1HSnL4avX/CUA7/tpgVuGBfNh+nY8Ol80UWHEisqQvTakgGl bwJ/Uikzns+7OS5GlqUxlJ2WPJmkNBhXl/YKx0AwWpPfQCyJ4hTc+/YMeMA38sxv/Z89 /7y32EcITK0WM+ctNzHAFRxLByt8kbLU67pMnrNnIfVSWtW9T6pDDWtKNG14rhZO+5vc 0+0w== X-Received: by 10.205.112.5 with SMTP id eq5mr6804495bkc.81.1366031989537; Mon, 15 Apr 2013 06:19:49 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id js7sm8527139bkb.9.2013.04.15.06.19.47 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 15 Apr 2013 06:19:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 15 Apr 2013 15:19:26 +0200 Message-Id: <1366031973-7718-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1366031973-7718-1-git-send-email-pbonzini@redhat.com> References: <1366031973-7718-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4008:c01::235 Cc: "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH 05/12] 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 From: "Michael S. Tsirkin" Functions defined in acpi/ should be declared in acpi.h Signed-off-by: Michael S. Tsirkin Signed-off-by: Paolo Bonzini --- arch_init.c | 1 + hw/i386/pc.c | 1 + hw/i386/pc_piix.c | 1 + include/hw/acpi/acpi.h | 7 +++++++ include/hw/i386/pc.h | 8 -------- 5 files changed, 10 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..4cd52c1 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 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,