From patchwork Fri Apr 8 20:28:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8785611 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 D9098C0553 for ; Fri, 8 Apr 2016 20:31:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 295D82024D for ; Fri, 8 Apr 2016 20:31:56 +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 6D6E020204 for ; Fri, 8 Apr 2016 20:31:55 +0000 (UTC) Received: from localhost ([::1]:58059 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aod4M-0008S2-QL for patchwork-qemu-devel@patchwork.kernel.org; Fri, 08 Apr 2016 16:31:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39638) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aod1r-0003QX-Is for qemu-devel@nongnu.org; Fri, 08 Apr 2016 16:29:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aod1q-00020q-KV for qemu-devel@nongnu.org; Fri, 08 Apr 2016 16:29:19 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:33054) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aod1q-00020e-A1 for qemu-devel@nongnu.org; Fri, 08 Apr 2016 16:29:18 -0400 Received: by mail-wm0-x242.google.com with SMTP id y144so6821844wmd.0 for ; Fri, 08 Apr 2016 13:29:18 -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=1F3pdkhw3pt4QQTJuhyUKupdphV8r2q0NXzxUNsCUMA=; b=htg1i1/yzKv7OoXVyXlG+9f2piV2gJ3d7Reg0M2xLSRlMddLRc1RDwnVwFcGiLsOfd mcbSCAJrNdpVKwBVbDfRivVH1MWfVBsvJ1cVPiyLtBUr1ajH4FO2sqkJVXQRL49lzNo6 mBnsIRSodYIUQKewQt04nE482M6oXPxzo6gEGRNnMe25UkMFrEaL0s99Ney2fubWGm+n ZC++3TvK6YFAoTak1QT+KCdAeEWvWtXqKv0quSGdK52m8mxV5cXunSjsNmgOVh2gQW+u YzaDdjbdKjTjB9Ukn6ECOy0sa7EKd/YezPoIU/JapsPthMYUcGPQm3nRbvu08dWHM8H2 5Arg== 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=1F3pdkhw3pt4QQTJuhyUKupdphV8r2q0NXzxUNsCUMA=; b=ExX6MpugLh54tjyJSii7LuB1lHQdn2780LJvEZaw659gE2tlWY3a2gjQLjlaS3cNS6 4/vFaUDRa0kssFSHatnJybeU1GIiigu0aKniq+kRNeaD2lW9nQ3Odn+Xppqs6FfGNE6W McH8mwgtvoEzBGp+228aaJUJ3GFtPGTmi74Dpbpt1n09ks7Fui5oqPnv5Nz0O2bTGVZj n4xE7xEYK0VEY/pEekv+FEWwRFX9b+1e5+xJviVSrEn/LobbAgOM+l9f0zJZ/7sXEhNV VvtgZqqy0HPgMz4WxvX81zCu2golqz0w3GqUhuqvcC5PpcJdcRPp6AgbXg69XGLzDVMX he0w== X-Gm-Message-State: AD7BkJKalz0vCI/3/GRt6/GfL3g5RK69ZNIxtkFSDGrHjKPbPRz8Ppa0VGGgQMqqzNR5ig== X-Received: by 10.28.187.5 with SMTP id l5mr5494365wmf.17.1460147357770; Fri, 08 Apr 2016 13:29:17 -0700 (PDT) Received: from 640k.lan (94-39-141-76.adsl-ull.clienti.tiscali.it. [94.39.141.76]) by smtp.gmail.com with ESMTPSA id w10sm3849168wjz.9.2016.04.08.13.29.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Apr 2016 13:29:17 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 8 Apr 2016 22:28:24 +0200 Message-Id: <1460147350-7601-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1460147350-7601-1-git-send-email-pbonzini@redhat.com> References: <1460147350-7601-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::242 Subject: [Qemu-devel] [PATCH 04/50] cpu: make cpu-qom.h only include-able from cpu.h 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 Make cpu-qom.h so that it is only included from cpu.h. Then there is no need for it to include cpu.h again. Later we will make cpu-qom.h target independent and we will _want_ to include it from elsewhere, but for now reduce the number of cases to handle. Signed-off-by: Paolo Bonzini Reviewed-by: Alex Bennée --- target-alpha/cpu-qom.h | 1 - target-arm/psci.c | 1 - target-i386/cpu-qom.h | 1 - target-lm32/cpu-qom.h | 1 - target-ppc/cpu-qom.h | 1 - target-s390x/cpu-qom.h | 1 - target-sparc/cpu-qom.h | 1 - target-unicore32/cpu-qom.h | 1 - target-xtensa/cpu-qom.h | 1 - 9 files changed, 9 deletions(-) diff --git a/target-alpha/cpu-qom.h b/target-alpha/cpu-qom.h index b01c6c8..cf5264a 100644 --- a/target-alpha/cpu-qom.h +++ b/target-alpha/cpu-qom.h @@ -21,7 +21,6 @@ #define QEMU_ALPHA_CPU_QOM_H #include "qom/cpu.h" -#include "cpu.h" #define TYPE_ALPHA_CPU "alpha-cpu" diff --git a/target-arm/psci.c b/target-arm/psci.c index c55487f..2b624b9 100644 --- a/target-arm/psci.c +++ b/target-arm/psci.c @@ -17,7 +17,6 @@ */ #include "qemu/osdep.h" #include -#include #include #include #include diff --git a/target-i386/cpu-qom.h b/target-i386/cpu-qom.h index cb75017..2ca7b9e 100644 --- a/target-i386/cpu-qom.h +++ b/target-i386/cpu-qom.h @@ -21,7 +21,6 @@ #define QEMU_I386_CPU_QOM_H #include "qom/cpu.h" -#include "cpu.h" #include "qemu/notify.h" #ifdef TARGET_X86_64 diff --git a/target-lm32/cpu-qom.h b/target-lm32/cpu-qom.h index 77bc7b2..54989e4 100644 --- a/target-lm32/cpu-qom.h +++ b/target-lm32/cpu-qom.h @@ -21,7 +21,6 @@ #define QEMU_LM32_CPU_QOM_H #include "qom/cpu.h" -#include "cpu.h" #define TYPE_LM32_CPU "lm32-cpu" diff --git a/target-ppc/cpu-qom.h b/target-ppc/cpu-qom.h index 7d5e2b3..eb822a3 100644 --- a/target-ppc/cpu-qom.h +++ b/target-ppc/cpu-qom.h @@ -21,7 +21,6 @@ #define QEMU_PPC_CPU_QOM_H #include "qom/cpu.h" -#include "cpu.h" #ifdef TARGET_PPC64 #define TYPE_POWERPC_CPU "powerpc64-cpu" diff --git a/target-s390x/cpu-qom.h b/target-s390x/cpu-qom.h index 1c90933..681e370 100644 --- a/target-s390x/cpu-qom.h +++ b/target-s390x/cpu-qom.h @@ -21,7 +21,6 @@ #define QEMU_S390_CPU_QOM_H #include "qom/cpu.h" -#include "cpu.h" #define TYPE_S390_CPU "s390-cpu" diff --git a/target-sparc/cpu-qom.h b/target-sparc/cpu-qom.h index 5096b10..174dfd3 100644 --- a/target-sparc/cpu-qom.h +++ b/target-sparc/cpu-qom.h @@ -21,7 +21,6 @@ #define QEMU_SPARC_CPU_QOM_H #include "qom/cpu.h" -#include "cpu.h" #ifdef TARGET_SPARC64 #define TYPE_SPARC_CPU "sparc64-cpu" diff --git a/target-unicore32/cpu-qom.h b/target-unicore32/cpu-qom.h index ea65b83..e554f1f 100644 --- a/target-unicore32/cpu-qom.h +++ b/target-unicore32/cpu-qom.h @@ -12,7 +12,6 @@ #define QEMU_UC32_CPU_QOM_H #include "qom/cpu.h" -#include "cpu.h" #define TYPE_UNICORE32_CPU "unicore32-cpu" diff --git a/target-xtensa/cpu-qom.h b/target-xtensa/cpu-qom.h index 2258224..f5d9b9f 100644 --- a/target-xtensa/cpu-qom.h +++ b/target-xtensa/cpu-qom.h @@ -30,7 +30,6 @@ #define QEMU_XTENSA_CPU_QOM_H #include "qom/cpu.h" -#include "cpu.h" #define TYPE_XTENSA_CPU "xtensa-cpu"