From patchwork Wed Jul 20 16:24:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 105982 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 98937B6F6F for ; Thu, 21 Jul 2011 16:45:34 +1000 (EST) Received: from localhost ([::1]:33963 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qjdp5-0002oA-VR for incoming@patchwork.ozlabs.org; Wed, 20 Jul 2011 16:56:51 -0400 Received: from eggs.gnu.org ([140.186.70.92]:40106) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZhR-00064F-LM for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:32:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QjZhD-0001Mq-V8 for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:32:41 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:39221) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZhB-0001Kv-OG for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:32:26 -0400 Received: from oxygen-old.pond.sub.org (unknown [IPv6:2a01:4f8:130:9021::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "oxygen.pond.sub.org", Issuer "CAcert Class 3 Root" (verified OK)) by oxygen.pond.sub.org (Postfix) with ESMTPS id 1138FA2485; Wed, 20 Jul 2011 18:32:24 +0200 (CEST) Received: from blackfin.pond.sub.org (p5B32D5F4.dip.t-dialin.net [91.50.213.244]) by oxygen-old.pond.sub.org (Postfix) with ESMTPA id 362E82771CE; Wed, 20 Jul 2011 18:32:23 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 7BE0D3D5; Wed, 20 Jul 2011 18:24:33 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 20 Jul 2011 18:24:22 +0200 Message-Id: <1311179069-27882-49-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1311179069-27882-1-git-send-email-armbru@redhat.com> References: <1311179069-27882-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 78.46.104.156 Cc: kwolf@redhat.com, quintela@redhat.com, dbaryshkov@gmail.com, stefano.stabellini@eu.citrix.com, lcapitulino@redhat.com, amit.shah@redhat.com Subject: [Qemu-devel] [PATCH 48/55] hw: Trim superfluous #include "block_int.h" 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Including it in device models is unclean, including it without a reason adds insult to injury. Signed-off-by: Markus Armbruster Reviewed-by: Christoph Hellwig --- hw/fdc.c | 1 - hw/ide/cmd646.c | 1 - hw/ide/ich.c | 1 - hw/ide/isa.c | 1 - hw/ide/macio.c | 1 - hw/ide/microdrive.c | 1 - hw/ide/mmio.c | 1 - hw/ide/pci.c | 1 - hw/ide/piix.c | 1 - hw/ide/via.c | 1 - hw/lsi53c895a.c | 1 - 11 files changed, 0 insertions(+), 11 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index debcd89..e8da6a9 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -36,7 +36,6 @@ #include "qdev-addr.h" #include "blockdev.h" #include "sysemu.h" -#include "block_int.h" /********************************************************/ /* debug Floppy devices */ diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 56302b5..79ceca0 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -27,7 +27,6 @@ #include #include #include "block.h" -#include "block_int.h" #include "sysemu.h" #include "dma.h" diff --git a/hw/ide/ich.c b/hw/ide/ich.c index 054e073..6f8c175 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c @@ -66,7 +66,6 @@ #include #include #include "block.h" -#include "block_int.h" #include "dma.h" #include diff --git a/hw/ide/isa.c b/hw/ide/isa.c index 4ac7453..28b69d2 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -26,7 +26,6 @@ #include #include #include "block.h" -#include "block_int.h" #include "dma.h" #include diff --git a/hw/ide/macio.c b/hw/ide/macio.c index 7daeb31..e92c330 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -26,7 +26,6 @@ #include #include #include "block.h" -#include "block_int.h" #include "dma.h" #include diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c index 9fbbf0e..61a6034 100644 --- a/hw/ide/microdrive.c +++ b/hw/ide/microdrive.c @@ -26,7 +26,6 @@ #include #include #include "block.h" -#include "block_int.h" #include "dma.h" #include diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c index 10f6f40..d6bb5e3 100644 --- a/hw/ide/mmio.c +++ b/hw/ide/mmio.c @@ -24,7 +24,6 @@ */ #include #include "block.h" -#include "block_int.h" #include "dma.h" #include diff --git a/hw/ide/pci.c b/hw/ide/pci.c index 9f3050a..a5371f4 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -27,7 +27,6 @@ #include #include #include "block.h" -#include "block_int.h" #include "dma.h" #include diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 84f72b0..a0bef42 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -27,7 +27,6 @@ #include #include #include "block.h" -#include "block_int.h" #include "sysemu.h" #include "dma.h" diff --git a/hw/ide/via.c b/hw/ide/via.c index 3474c37..3c131f6 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -28,7 +28,6 @@ #include #include #include "block.h" -#include "block_int.h" #include "sysemu.h" #include "dma.h" diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index 940b43a..0930519 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c @@ -15,7 +15,6 @@ #include "hw.h" #include "pci.h" #include "scsi.h" -#include "block_int.h" //#define DEBUG_LSI //#define DEBUG_LSI_REG