From patchwork Thu May 19 11:18:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 9126921 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C41A79F37F for ; Thu, 19 May 2016 11:40:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D6FE920212 for ; Thu, 19 May 2016 11:40:58 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 282D62020F for ; Thu, 19 May 2016 11:40:58 +0000 (UTC) Received: from localhost ([::1]:49795 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3MK1-000705-6l for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 May 2016 07:40:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36874) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3Lz0-0004FF-OX for qemu-devel@nongnu.org; Thu, 19 May 2016 07:19:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b3Lyz-00048a-I1 for qemu-devel@nongnu.org; Thu, 19 May 2016 07:19:14 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:35311) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3Lyz-00048P-Au for qemu-devel@nongnu.org; Thu, 19 May 2016 07:19:13 -0400 Received: by mail-wm0-x243.google.com with SMTP id s63so5551490wme.2 for ; Thu, 19 May 2016 04:19:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=3F2ATmGBvDc6kGCNuDABFqbxs7FCsKg/CGGUQ8cvIuE=; b=UZ7TRiUqSt+lCFxz4aihqZ1jFM0O5WS+PASuNmU7jYaWQ8fUxz9iBAg4y5apzmjp+y qbRi+dyrsqXbSHGdp9uWn53eZ5C4wLvTL8GuA2Vnr6ER+0NFNRkBtIk1ruujjhI3TQD3 TeutFGXDvAKURKF5AVDI2g6GWe2Jy1g6XJljxWhxERPTMdYtLg23AnVpE2tOHBRBTyuk IoaXm6XCLLOE6malXgrh/eMQ4816KVMTHZ6vDxXlTVV0luEDP8V5zxLIinJlOsmgcVwd nHu4i5khtrRXJfdvshvPxnWcn+iMWm5eJ76m3WYh2FX7AQ0TLGddGW/I2g8fFno/nfni ES3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=3F2ATmGBvDc6kGCNuDABFqbxs7FCsKg/CGGUQ8cvIuE=; b=R4flEsjHdijNwgIRdp8ZDRl/U4SjcEJ5hktnZX/dyTxx0xQkcS8sQRWzTaOfBa/iCZ NwS5dbCNwYma16HHXezsViA1sPg41BhqfaVw9hE+CyvIKn1rimzQUOziZP3MPQjJaWLG 2Z76mC5QjXRz+86DN3gKUu4P9xBLllIhTxKgbSDFw5JVglq1mZWxUpMFSeccBWOAWN9q XmsSP7ez9CypEiGcTyttdT7EoBJUMEesaUymvpiwIIBCCisXM0wKstmJMlpsxo4zfNSM wbu9re3Jkhf6LDa0JTif4yQu41etq9IcDVFbImnIDHO9cq1jhO2VC+WrZK/pX+mdbWVZ gSmg== X-Gm-Message-State: AOPr4FUE862uMtzpAWoRNAoojau0P09w+Yk+RwHgOlNBYPyqA3/VGuuH0NfZB5OvlDx/8A== X-Received: by 10.194.149.37 with SMTP id tx5mr14157939wjb.94.1463656752808; Thu, 19 May 2016 04:19:12 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-252-58.clienti.tiscali.it. [78.12.252.58]) by smtp.gmail.com with ESMTPSA id c7sm8374317wji.38.2016.05.19.04.19.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 May 2016 04:19:12 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 19 May 2016 13:18:17 +0200 Message-Id: <1463656726-35952-24-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1463656726-35952-1-git-send-email-pbonzini@redhat.com> References: <1463656726-35952-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PULL 23/52] arm: include cpu-qom.h in files that require ARMCPU X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This will keep things working when cpu.h will not be included indirectly almost everywhere (either directly or through qemu-common.h). Signed-off-by: Paolo Bonzini --- hw/arm/stm32f205_soc.c | 1 - hw/arm/strongarm.h | 1 + include/hw/arm/arm.h | 2 +- include/hw/arm/exynos4210.h | 1 + include/hw/arm/omap.h | 1 + include/hw/arm/pxa.h | 1 + 6 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c index a5ea1e2..9c1dafb 100644 --- a/hw/arm/stm32f205_soc.c +++ b/hw/arm/stm32f205_soc.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu-common.h" -#include "cpu.h" #include "hw/arm/arm.h" #include "exec/address-spaces.h" #include "hw/arm/stm32f205_soc.h" diff --git a/hw/arm/strongarm.h b/hw/arm/strongarm.h index 2893f94..cd32bbd 100644 --- a/hw/arm/strongarm.h +++ b/hw/arm/strongarm.h @@ -2,6 +2,7 @@ #define _STRONGARM_H #include "exec/memory.h" +#include "target-arm/cpu-qom.h" #define SA_CS0 0x00000000 #define SA_CS1 0x08000000 diff --git a/include/hw/arm/arm.h b/include/hw/arm/arm.h index b2517f9..8b49a98 100644 --- a/include/hw/arm/arm.h +++ b/include/hw/arm/arm.h @@ -12,9 +12,9 @@ #define ARM_MISC_H 1 #include "exec/memory.h" +#include "target-arm/cpu-qom.h" #include "hw/irq.h" #include "qemu/notify.h" -#include "cpu.h" typedef enum { ARM_ENDIANNESS_UNKNOWN = 0, diff --git a/include/hw/arm/exynos4210.h b/include/hw/arm/exynos4210.h index 5c1820f..b6d929d 100644 --- a/include/hw/arm/exynos4210.h +++ b/include/hw/arm/exynos4210.h @@ -28,6 +28,7 @@ #include "qemu-common.h" #include "exec/memory.h" +#include "target-arm/cpu-qom.h" #define EXYNOS4210_NCPUS 2 diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h index 0ad5fb8..f026c8d 100644 --- a/include/hw/arm/omap.h +++ b/include/hw/arm/omap.h @@ -20,6 +20,7 @@ #include "exec/memory.h" # define hw_omap_h "omap.h" #include "hw/irq.h" +#include "target-arm/cpu-qom.h" # define OMAP_EMIFS_BASE 0x00000000 # define OMAP2_Q0_BASE 0x00000000 diff --git a/include/hw/arm/pxa.h b/include/hw/arm/pxa.h index 259b852..074feac 100644 --- a/include/hw/arm/pxa.h +++ b/include/hw/arm/pxa.h @@ -10,6 +10,7 @@ # define PXA_H "pxa.h" #include "exec/memory.h" +#include "target-arm/cpu-qom.h" /* Interrupt numbers */ # define PXA2XX_PIC_SSP3 0