From patchwork Thu May 19 11:17:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 9126541 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 B67E29F1C3 for ; Thu, 19 May 2016 11:23:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EF8EB2021B for ; Thu, 19 May 2016 11:23:51 +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 3583D20219 for ; Thu, 19 May 2016 11:23:51 +0000 (UTC) Received: from localhost ([::1]:49706 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3M3S-00087O-78 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 May 2016 07:23:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36617) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3Lyk-00041p-5A for qemu-devel@nongnu.org; Thu, 19 May 2016 07:18:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b3Lyh-00042N-HV for qemu-devel@nongnu.org; Thu, 19 May 2016 07:18:57 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:33952) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3Lyh-00042D-76 for qemu-devel@nongnu.org; Thu, 19 May 2016 07:18:55 -0400 Received: by mail-wm0-x244.google.com with SMTP id n129so20158490wmn.1 for ; Thu, 19 May 2016 04:18:55 -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 :mime-version:content-transfer-encoding; bh=o+DNHNQE5TzmoJSbDStoZBLOIfcknrfmkByFhVZ6UJM=; b=XeZfLf/vmkCg26iNgbzqbl0rv0ORHEcBCZcne8ZjfQfD9z8v+/QF4mKCV1rpvM+7Jr sWk1djsSs2/pcWOcO4x5v0AbRJeArxx5y/9t+0EgNc57AQtXUJ4DaYytdlXw71ntDxsW Sx3XThaEd9vnFkjKloJGPpyrA7TU20fHAY0Wu6os+VudBEdT0aJeIUgiV501ZcXdRIxc bkn5iAj0hxJSqEDLfmH4DGEsYOmdAFJFPmUfXo+LvZh0bg8YLaJiOc6H7jzP993Uf1VZ Q07ZObkj0DYa02qML2OuIg3C361rLkNc7N+v5nkZqTWcfpy8J2/P1merRIgwEUeseh7U ytiw== 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:mime-version:content-transfer-encoding; bh=o+DNHNQE5TzmoJSbDStoZBLOIfcknrfmkByFhVZ6UJM=; b=cMu91LFX7DEWymtkI1luBNJGgLlxetzds+30vDKufajWW/KQTiCX5S+r/hs/PkOFxG 5bX8I3dv8DnYBqYWOdylo6P7fzrnZa4EypRR5UADYxUvISi81IlGbEgihmFLxht6vYDg wJrD260wzGc4lq9b8/2AXF0QvF1ty3yG6FalBN9TXjVEJYtKapp9GTjmiTJIf7NBSJOX rkLJA30f/DDLYppussPK8DehHFuX8lmW0wLtGnTGLFi0+d17vaWcLiTWwJcoIgkhNY4S qksQN80ybV9P0u1+7DSzGkcWCZPwZxNAzNua7kRcieQIBauYU7Zl9YIBiPk2rhntfHBt 5B8Q== X-Gm-Message-State: AOPr4FV/efxqaufPSv7wLu+C7srQSECVBgolKZPDBH4MUykLv6od5oeNV/rQY1SmMQ7T6w== X-Received: by 10.28.39.196 with SMTP id n187mr12875490wmn.4.1463656734619; Thu, 19 May 2016 04:18:54 -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.18.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 May 2016 04:18:53 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 19 May 2016 13:17:59 +0200 Message-Id: <1463656726-35952-6-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> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PULL 05/52] 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. Reviewed-by: Alex Bennée Signed-off-by: Paolo Bonzini --- 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 ce2e0dc..071bbb4 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"