From mboxrd@z Thu Jan 1 00:00:00 1970 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) 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) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 16 Mar 2016 11:46:59 +0100 Message-Id: <1458125219-131698-50-git-send-email-pbonzini@redhat.com> In-Reply-To: <1458125219-131698-1-git-send-email-pbonzini@redhat.com> References: <1458125219-131698-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 49/49] hw: clean up hw/hw.h includes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 -- 1.8.3.1