From patchwork Thu May 19 11:18:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 9127381 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 63DF5BF29F for ; Thu, 19 May 2016 11:59:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B0AD520211 for ; Thu, 19 May 2016 11:59:53 +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 0A4D8201C0 for ; Thu, 19 May 2016 11:59:53 +0000 (UTC) Received: from localhost ([::1]:49886 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3McK-0007YU-4Y for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 May 2016 07:59:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37419) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3Lzh-00050G-NS for qemu-devel@nongnu.org; Thu, 19 May 2016 07:20:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b3LzX-0004Lg-L9 for qemu-devel@nongnu.org; Thu, 19 May 2016 07:19:56 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:36649) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3LzX-0004Lc-8S for qemu-devel@nongnu.org; Thu, 19 May 2016 07:19:47 -0400 Received: by mail-wm0-x244.google.com with SMTP id w143so20030365wmw.3 for ; Thu, 19 May 2016 04:19:47 -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=Rhgc4jrrS4FS2GZESMTEs4k2cN9hOPZbEgzgnXN+ccM=; b=vxOK8ArCcdVJFtKofg/6SiqvFkWCGcfjwhrl6dhaLGMT+DvXVD9Sp5BHFBJNjT3DnP NzdzttvF+Ljcan4m4zJi0cSYkt0AunP4eAvIV/pDX2pwR7+LPJ9UjaF3j1KSq0niuK8z r66n6yda8dUpf87EqW0w0hhkQic9mVF+YRYC2pfzLaPzuyfRsurQDIi5XZR2/fHESy79 DayHxGlAdjuSuipoiYjuF8rvPwlCR3WAXdfAEp3v3GYrQ6rpj88VlmFGBBNfiB8U5JVf x0h9SIlRsbLJx1KpA7mz7IMGUc1t4FbaNcQoGV+MqsBSpd9Cf0yoDwCvURxvOLzlAVrr yTnw== 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=Rhgc4jrrS4FS2GZESMTEs4k2cN9hOPZbEgzgnXN+ccM=; b=Zz1MEr+A7hX6NSVRu5/f/c0XVgCZCoecdKtnHXw0NITFtJwR+jmy7RLbTO+wJerbK9 aAqa/AtBcJdnufV77Fj1lACh0VoWim3JoGrmC05jkKaUQRKdE5hvoAmhk/WagcEQh5x4 LJwyvmVGof3xCpOtbL8ii2+f5L+IAZBhGguDcltsd2V6xMzKXwyzjlxDya8pLjp6hyWw x0FX/McnPWVlYWZVAQvYAS86DEyWgvAq3eZebMmx1W4F+/DDJnNkVwQJ0huVviDqajAN K+Y/2EMhWfN4wqwpuOJdRcTFTrDYPloypopEnnXIYjerc4tppr2nJJc09GDCbNcefrEj Yv4g== X-Gm-Message-State: AOPr4FVc/HyHl3Nh4fGRbm+W+ljzmECySOIAc96TCVd+boGAVr4vdSkHSs4otFzimgacKw== X-Received: by 10.194.85.132 with SMTP id h4mr12841959wjz.50.1463656786718; Thu, 19 May 2016 04:19:46 -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.19.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 May 2016 04:19:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 19 May 2016 13:18:46 +0200 Message-Id: <1463656726-35952-53-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> 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 52/52] 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+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 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 e276ec3..2e363f0 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