From patchwork Mon May 16 15:35:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 9103901 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 0B3B3BF29F for ; Mon, 16 May 2016 15:39:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 490832012D for ; Mon, 16 May 2016 15:39:32 +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 851A920125 for ; Mon, 16 May 2016 15:39:31 +0000 (UTC) Received: from localhost ([::1]:44438 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2KcE-000658-QP for patchwork-qemu-devel@patchwork.kernel.org; Mon, 16 May 2016 11:39:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57430) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2KZS-0001OL-9f for qemu-devel@nongnu.org; Mon, 16 May 2016 11:36:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b2KZL-0006Vb-PY for qemu-devel@nongnu.org; Mon, 16 May 2016 11:36:37 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:36143) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2KZL-0006VN-8T for qemu-devel@nongnu.org; Mon, 16 May 2016 11:36:31 -0400 Received: by mail-wm0-x242.google.com with SMTP id w143so18870821wmw.3 for ; Mon, 16 May 2016 08:36:31 -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=fY3gDrguJYnUrfoibkadKuBR1H4TXQXUHHTxVeY6peLtSzkDjqIpUXzdPvsQsxluFq AsLOkgorHqiYSkoSlXNfsKDZGIrpaOwsvjyebiwD+pPqsJzYXGdRRnQDVCZha3kj4Gud 4EUwqQjZA9ldxTN0kmunNXT74wd0zMQ25YKzyECCVelVUAg0MbZ+MGNePtLaL7Dj3gJn iuZT0BF730LJG9h/qKzp8dWik7QThhDnexIIIionZkt1L60Y13y6aRtDykIQje4Hk4CV jzoM5tEGMohRG+z6eMe7jXZ8gNDraolUrwV1vdm+A9k02W8rvSGkcdPH5qAbh3CVvRcD 4pdA== 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=g6/4xJDWEwiJv5/q2wAPxr6eaUv8gqeoP2AtT1a+oVs3WFkAh8xEiFqjziSwCmqor4 faanUuV56szFpFayW3rp0zf2Dkpo2HN76WUqrWqD75ub6kRzxxmyXOew2R124nZkENLs sZZ17tIaR+isvaMNcxktU1xcBEoH1ZwVKEHLYZGZVTQXlPpUtHXmZQ4hujVN6cc45sZ8 Z/8+GIj2UXlOYVopt3uaUmuWl3VLWM3p5Qcj2NeLetL2pbc1V26bu5S5TO1KrAHPnW9T m8w1+wy7TG+sABnt33GXvNdzNP4jOIt8NG145FUfDuTLSKaXMHN8g9OhERCzc/tYObOi OTgw== X-Gm-Message-State: AOPr4FUN/qFkFuA2VrPAOfGepe8lf2b0bhKoviDL7M3BfChQRBjGjiIYYg9CQ7qVTz8qFg== X-Received: by 10.194.142.147 with SMTP id rw19mr30466102wjb.31.1463412990715; Mon, 16 May 2016 08:36:30 -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.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 May 2016 08:36:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 16 May 2016 17:35:36 +0200 Message-Id: <1463412982-6681-5-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> 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::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. 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"