From patchwork Mon Sep 12 14:19:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 114369 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 C0682B71CA for ; Tue, 13 Sep 2011 00:53:44 +1000 (EST) Received: from localhost ([::1]:41878 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R37tE-0007BZ-TJ for incoming@patchwork.ozlabs.org; Mon, 12 Sep 2011 10:53:40 -0400 Received: from eggs.gnu.org ([140.186.70.92]:38669) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R37K9-00024p-6v for qemu-devel@nongnu.org; Mon, 12 Sep 2011 10:17:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R37Jz-00079L-59 for qemu-devel@nongnu.org; Mon, 12 Sep 2011 10:17:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12811) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R37Jy-00079B-R7 for qemu-devel@nongnu.org; Mon, 12 Sep 2011 10:17:15 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p8CEHD8d020655 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Sep 2011 10:17:13 -0400 Received: from dhcp-5-188.str.redhat.com (dhcp-5-175.str.redhat.com [10.32.5.175]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p8CEGa2v030698; Mon, 12 Sep 2011 10:17:12 -0400 From: Kevin Wolf To: anthony@codemonkey.ws Date: Mon, 12 Sep 2011 16:19:25 +0200 Message-Id: <1315837174-15327-27-git-send-email-kwolf@redhat.com> In-Reply-To: <1315837174-15327-1-git-send-email-kwolf@redhat.com> References: <1315837174-15327-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 26/35] 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 From: Markus Armbruster Including it in device models is unclean, including it without a reason adds insult to injury. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- 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/via.c | 1 - hw/lsi53c895a.c | 1 - 10 files changed, 0 insertions(+), 10 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index edade2b..57eda0c 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 4d91e2c..5fe98b1 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 5278bc4..0327d0e 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 fdf5d75..c1844cb 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 91c0e3c..9eee5b5 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 132b751..2ec21b0 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 d1a14d7..9fded02 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/via.c b/hw/ide/via.c index c0b9d43..dab8a39 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 ac284e9..dbb3bdf 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