From patchwork Mon May 16 15:36:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 622658 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3r7lfj72lKz9sdn for ; Tue, 17 May 2016 02:05:17 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Rjlu9aPF; dkim-atps=neutral Received: from localhost ([::1]:44666 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2L19-0004YG-Te for incoming@patchwork.ozlabs.org; Mon, 16 May 2016 12:05:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58081) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2KaN-00038V-JE for qemu-devel@nongnu.org; Mon, 16 May 2016 11:37:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b2KaB-0006o4-9d for qemu-devel@nongnu.org; Mon, 16 May 2016 11:37:34 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:36394) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2KaB-0006np-3C for qemu-devel@nongnu.org; Mon, 16 May 2016 11:37:23 -0400 Received: by mail-wm0-x241.google.com with SMTP id w143so18877024wmw.3 for ; Mon, 16 May 2016 08:37:22 -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=7KsQpctSHV0YsF9QAt/KN8lV9iO79svlbFiW8NyA5Z0=; b=Rjlu9aPF6OYjT3Me05nVlKvWqCHUMP9lcLoEVCF6+a6GYDTv8cYg3XeGZqMLVtZjTx bZvsDtwiKKYsWOCQ3de30swStp6wp7HH1vzY1Lr9XZ6zqr7WJ3TRmC8G0cuEOgQZcad4 oWSKXGYcnG++JtSUbQev4XJOvvdz+WtC+mmpO0hMbBknzHDXcpkeSfZxE9iWhmbQY7Z1 8XdFT/O0pfwyC9u1sLQcs/PnJxjxO5RFVDjUZE3oNpvEcyJwnGmQcSQGOxgDM2IU25qL Ur/dfwx5gJgyncgflunTbPBSn58E8oMGJ6Fp8jdUlPSf/vBL+LUEjcG4q0IoUSbP+Kzf GGkQ== 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=7KsQpctSHV0YsF9QAt/KN8lV9iO79svlbFiW8NyA5Z0=; b=mf3iMWVjUK0PJHrWaaNpxR2nI4SdP0GnP7tUbg6C1/EFv2yuSaUZgtTUlqLCz+htI2 4S0wrmddEowy7UgK6D6afCegBD0WIi/KjVlePAv2D91uHYgpn5DPXd3um27//iues5Dz rrtxIcg0irfbAVJch7cr+Cxjir/Wcl/5iDCuxI4z4m6FHV1W1hnHwsmfnwhR/FVU7dpt 28FBHdacSbaeON2P+pmssOawJFlO7D3DcXODdcZWWJIjPCqvgNjmafrIlPPKZKEYwgNT SFfLxIfrdvjhUW0lCLlmSy40xsy8mBM8FI8nXXo+rWWDR+FraQ+K1yzh/T9u4eJu4eGq /LCQ== X-Gm-Message-State: AOPr4FUK5I7pj3pxkULM5q0ZcOz5nMHrxXr6DLTlHe8NAMLWbxFHy8nAQ5EB1xDXixnk+A== X-Received: by 10.194.172.136 with SMTP id bc8mr8244206wjc.110.1463413042529; Mon, 16 May 2016 08:37:22 -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.37.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 May 2016 08:37:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 16 May 2016 17:36:22 +0200 Message-Id: <1463412982-6681-51-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> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PATCH 50/50] hw: clean up hw/hw.h includes 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 + hw/gpio/gpio_key.c | 1 + include/exec/ioport.h | 4 ---- include/hw/hw.h | 4 ++-- include/hw/isa/isa.h | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/exec.c b/exec.c index 29877b0..64956a4 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/hw/gpio/gpio_key.c b/hw/gpio/gpio_key.c index ef28772..b34aa49 100644 --- a/hw/gpio/gpio_key.c +++ b/hw/gpio/gpio_key.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "qemu/timer.h" #define TYPE_GPIOKEY "gpio-key" #define GPIOKEY(obj) OBJECT_CHECK(GPIOKEYState, (obj), TYPE_GPIOKEY) 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