From patchwork Wed Mar 16 10:46:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8598391 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 21A639F3D1 for ; Wed, 16 Mar 2016 11:08:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 673072022A for ; Wed, 16 Mar 2016 11:08:07 +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 B3F9220218 for ; Wed, 16 Mar 2016 11:08:06 +0000 (UTC) Received: from localhost ([::1]:55112 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag9J7-0006q0-VU for patchwork-qemu-devel@patchwork.kernel.org; Wed, 16 Mar 2016 07:08:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37470) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag8zf-000492-4f for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:48:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ag8ze-0002TA-7D for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:47:59 -0400 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]:34831) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag8ze-0002SC-17 for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:47:58 -0400 Received: by mail-wm0-x230.google.com with SMTP id l68so183379951wml.0 for ; Wed, 16 Mar 2016 03:47:57 -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=V53XUHhM1/0qwETSaQXHVffDjMsNafCXPW3Eio20PuM=; b=RjHAEhHZ6xRTfr/43Ow9P6isTj3FalpPSINm9AjzWELTUgjZ1LNUmXuGJVUjEqwBnB QBqMJUT6g7JAatW9hAPvcwi7PaIqXjLsd29TLj9tVJhAlCicaOK3AVB3KqHiCbgMchyf WAiVj3KWsow/OIErTp8ycLtMqyXdWWOoQZhaPH06LaK+/q8FUvf47r8Use1x9VdF5uX1 +qN66texAXfkVcM7/CfFU+zW7wQm9O5UMmQPwdnHW2ghtO5rDtuhmHbVAC0mME+g/Csd hsmNpxXUK1dcUZ2u19EI9bavKySLXm7oPpA4ApEUxK1739TeZ2fGGwYQk4vt2cUTjAQ0 zz9A== 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=V53XUHhM1/0qwETSaQXHVffDjMsNafCXPW3Eio20PuM=; b=HKcCe4SksZgl3m0+GPVZ+bkknAZxXnDGGm3uh86aL9KQdHY5/PX0Xg4KTiTKcewar/ KVzgk6zfby6iOvjo5oUZMCZ1WVGFaJUxPvQrOViIMnqYh/Kpjdi0yE/w2RMtumsLEr9E asiLFaAkedvlMDC8USoVJj6n+a+s0TioWpqK65fJmDs0W66clGxqt7xpPsUiDZbtP6Z1 555npYmrTpwfkty4k9fl6NYQDj2vSHrNeDsigWF3bnTwlNMfmBOSJ2/yt+y6S5ES9SY1 iHUj18P7eoc5QB1K0FpGK2nbPD+VG55ST/q/UkL2m2rez52DN6Iug6UAcGXeuByy1dX7 HumQ== X-Gm-Message-State: AD7BkJKqNPKIgLWRekC4vxjhzSQPFH9EtfKhuNPyY+C51fhfFMLnrJB0pIDE1xldBiI7VA== X-Received: by 10.28.195.136 with SMTP id t130mr30619824wmf.27.1458125277382; Wed, 16 Mar 2016 03:47:57 -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.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Mar 2016 03:47:56 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 16 Mar 2016 11:46:59 +0100 Message-Id: <1458125219-131698-50-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::230 Subject: [Qemu-devel] [PATCH 49/49] hw: clean up hw/hw.h includes 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 Include qom/object.h and exec/memory.h instead of exec/ioport.h; exec/ioport.h was almost everywhere required only for those two includes, not for the content of the header itself. Remove block/aio.h, everybody is already including it through another path. With this change, include/hw/hw.h is freed from qemu-common.h. Signed-off-by: Paolo Bonzini --- exec.c | 1 + include/exec/ioport.h | 4 ---- include/hw/hw.h | 4 ++-- include/hw/isa/isa.h | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/exec.c b/exec.c index b8493d8..798219e 100644 --- a/exec.c +++ b/exec.c @@ -41,6 +41,7 @@ #else /* !CONFIG_USER_ONLY */ #include "hw/hw.h" #include "exec/memory.h" +#include "exec/ioport.h" #include "sysemu/dma.h" #include "exec/address-spaces.h" #include "sysemu/xen-mapcache.h" diff --git a/include/exec/ioport.h b/include/exec/ioport.h index 6a9639c..a298b89 100644 --- a/include/exec/ioport.h +++ b/include/exec/ioport.h @@ -24,10 +24,6 @@ #ifndef IOPORT_H #define IOPORT_H -#include "qemu-common.h" -#include "qom/object.h" -#include "exec/memory.h" - #define MAX_IOPORTS (64 * 1024) #define IOPORTS_MASK (MAX_IOPORTS - 1) diff --git a/include/hw/hw.h b/include/hw/hw.h index 029b1e8..3669ebd 100644 --- a/include/hw/hw.h +++ b/include/hw/hw.h @@ -7,9 +7,9 @@ #endif #include "exec/cpu-common.h" -#include "exec/ioport.h" +#include "qom/object.h" +#include "exec/memory.h" #include "hw/irq.h" -#include "block/aio.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index ffb2ea7..c87fbad 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -3,8 +3,8 @@ /* ISA bus */ -#include "exec/ioport.h" #include "exec/memory.h" +#include "exec/ioport.h" #include "hw/qdev.h" #define ISA_NUM_IRQS 16