From patchwork Mon May 16 15:35:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 9104211 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 0004A9F30C for ; Mon, 16 May 2016 15:56:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3377B2026C for ; Mon, 16 May 2016 15:56:23 +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 79D9E20160 for ; Mon, 16 May 2016 15:56:22 +0000 (UTC) Received: from localhost ([::1]:44588 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2KsX-0000Pt-Fu for patchwork-qemu-devel@patchwork.kernel.org; Mon, 16 May 2016 11:56:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57717) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2KZn-00020p-Uu for qemu-devel@nongnu.org; Mon, 16 May 2016 11:37:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b2KZd-0006cA-Rz for qemu-devel@nongnu.org; Mon, 16 May 2016 11:36:58 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:32846) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2KZd-0006c4-M0 for qemu-devel@nongnu.org; Mon, 16 May 2016 11:36:49 -0400 Received: by mail-wm0-x241.google.com with SMTP id r12so18962631wme.0 for ; Mon, 16 May 2016 08:36:49 -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=D51ZYaqTWFxJwSMt2b6n269Yb1uFcdudD4xEaXCCCf/Bb9aHYlti/WRzt3ulptLIHS fpN8a8IZ2/9fvIAlx1OQwH18xlMr3rW6226eAdzZVUB+9Jjg1H72lAo7MO3h1N5RPaCz +24aVsZHVfDRhmcjx96xbrBqiv0uB3b5RTlNGZ/jRiHqAPjU5Sh1tDEDH1qUmFzHL3L5 UrQ70q70eacgb7VXGMyqM54xxN8Whtla9Y7VEBC277m566cLdOsqGDp56xwbexAOtzz/ /VJc12k9slKOuiTctf2Jm3cHrh569BFN7orWqw/3HAi1U1hYlxIHAahDCKGXKrFCw7QA lR8w== 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=Knx6Zloeo9IQwqfJWExrrBnKM9+SI3S0ay3dZc0Vnn+cMEthwL6h5ecTWgdDM2u5bl Zz2a/e53ljt5bYWGfuNaGQXWcG30LaPcK52oVKExlL8mu5Eoz04oORfwmgQLwuUYXYDb TILIQk4NIpHWerdASMKkLcDPf5+Os/7hKzB43Pyk4+X0aNosBeZwvIjmQwjenrb+L7Bm 7jqN79whJtc7XUrexdssFNm7yEx5NuBRLaeT8sOu8tU0sNQirViniCgKneyn4LW/ILVQ 1lmZHeY/UivnLa2i1fgGTH6TCJKa88quN9geZj06WxJbeK1RHSWun0ChRN2XwD0qTh7k 5U0Q== X-Gm-Message-State: AOPr4FWPJ8Dt9+y6WnLd7UJrovTYTyiPblViEtIGeceD1h7bG7FMKI9RhgL8oQgV6VFZEQ== X-Received: by 10.28.189.138 with SMTP id n132mr18923256wmf.34.1463413009129; Mon, 16 May 2016 08:36:49 -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 lf9sm34386875wjc.44.2016.05.16.08.36.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 May 2016 08:36:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 16 May 2016 17:35:53 +0200 Message-Id: <1463412982-6681-22-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1463412982-6681-1-git-send-email-pbonzini@redhat.com> References: <1463412982-6681-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::241 Subject: [Qemu-devel] [PATCH 21/50] 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