From patchwork Wed Mar 16 10:46:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8597821 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1E291C0553 for ; Wed, 16 Mar 2016 10:56:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 482DC202F0 for ; Wed, 16 Mar 2016 10:56:10 +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 914C12026C for ; Wed, 16 Mar 2016 10:56:09 +0000 (UTC) Received: from localhost ([::1]:54987 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag97Z-0001nD-06 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 16 Mar 2016 06:56:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37055) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag8zE-0003Gp-9X for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:47:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ag8z9-00028U-VX for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:47:32 -0400 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]:36053) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag8z9-00028K-Og for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:47:27 -0400 Received: by mail-wm0-x236.google.com with SMTP id l124so43283106wmf.1 for ; Wed, 16 Mar 2016 03:47:27 -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=9rsItNrgVpChB+9+mKid4++RXJ2YMKxK1bi8YD4wvo4=; b=kBnvSG3kY8kw0u+WaERpbsXMAefdeqYqWCroBIrL0xZ0ADZWmp+8zhCqfz4RmS+MrK slb42HegvVtd8TG5LT/F3KFMbcDMYOY92cvWzjmjvEjhflUgE6ecuqazb4I1J1UFNwLr cwFTuKNNinJ7dlysa87Cdehy8SKpiQet2xuwOVRO+9R62FtwJqm/RtnVIsW/smMy0i/Y IbeoKRw0YgTWwMaWTsbn90hya97HUakDUN7lxqczJxNFEcMiUERKEIfRhT0xZnmSKSmP Rwv4+imOInS4DaLduPWkHhalbVHkjfZybE78NXwGPcKeBUoZGXyBK6vPS2qTzQJpu9g2 yX0w== 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=9rsItNrgVpChB+9+mKid4++RXJ2YMKxK1bi8YD4wvo4=; b=HsW2q/bdszMqy14Jz3w/CCbq+iNsl+ZP9MofYSCYDjEKUeUUXz9E8ioP5iJDrcQv1l ivVwT28mB9x55ZO7c8RmlQFb7keb5yqUvfjo7/BCLPSJL3jnfs6pu2gzc+s6KjSLwpGB K5x0/aJJJxVGRU9qMouDdDUUfYGkAagGU1PJZPVkUi94voqtkb50yzR9k8Q2OeHzzl/4 qQRmyorInaYxc4asMDnBKc9IW5uCgJSANNpXf2YmMh7wFKhQk3sx2K/1+XmC3HXfbPTS GZB0dcH0Akk37ZieXEtRmlDMpe5FwVdz2hUPJZoqDKk2tTcxQjQORZy1TTXIiSa/EZ6F Omag== X-Gm-Message-State: AD7BkJKMoA4EWfq+6hUzwwlPD/u43iit3118ESMu5qbrSBCykJDyUXDJhIpulgvWKZ0QkQ== X-Received: by 10.28.132.17 with SMTP id g17mr30179221wmd.63.1458125247014; Wed, 16 Mar 2016 03:47:27 -0700 (PDT) Received: from 640k.lan (94-39-161-17.adsl-ull.clienti.tiscali.it. [94.39.161.17]) by smtp.gmail.com with ESMTPSA id wr2sm2418094wjc.49.2016.03.16.03.47.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Mar 2016 03:47:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 16 Mar 2016 11:46:31 +0100 Message-Id: <1458125219-131698-22-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1458125219-131698-1-git-send-email-pbonzini@redhat.com> References: <1458125219-131698-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::236 Subject: [Qemu-devel] [PATCH 21/49] arm: include cpu-qom.h in files that require ARMCPU 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org 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 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