From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B135BC433FF for ; Tue, 13 Aug 2019 15:58:36 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8133A20578 for ; Tue, 13 Aug 2019 15:58:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8133A20578 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxZBz-00044O-MB for qemu-devel@archiver.kernel.org; Tue, 13 Aug 2019 11:58:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52555) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxZ1I-0004bp-EM for qemu-devel@nongnu.org; Tue, 13 Aug 2019 11:47:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxZ1H-0002gs-6b for qemu-devel@nongnu.org; Tue, 13 Aug 2019 11:47:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55454) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxZ1G-0002gH-VQ for qemu-devel@nongnu.org; Tue, 13 Aug 2019 11:47:31 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4A8D03023087 for ; Tue, 13 Aug 2019 15:47:30 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-117-142.ams2.redhat.com [10.36.117.142]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 194CD1000323; Tue, 13 Aug 2019 15:47:19 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id B2A6D1136451; Tue, 13 Aug 2019 17:46:53 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 13 Aug 2019 17:46:34 +0200 Message-Id: <20190813154653.20568-11-armbru@redhat.com> In-Reply-To: <20190813154653.20568-1-armbru@redhat.com> References: <20190813154653.20568-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 13 Aug 2019 15:47:30 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 10/29] ide: Include hw/ide/internal a bit less outside hw/ide/ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" According to hw/ide/internal's file comment, only files in hw/ide/ are supposed to include it. Drag reality slightly closer to supposition. Three includes outside hw/ide remain: hw/arm/sbsa-ref.c, include/hw/ide/pci.h, and include/hw/misc/macio/macio.h. Turns out board code needs ide-internal.h to wire up IDE stuff. More cleanup is needed. Left for another day. Cc: John Snow Signed-off-by: Markus Armbruster Reviewed-by: John Snow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190812052359.30071-11-armbru@redhat.com> --- hw/ide/ahci_internal.h | 1 + hw/ppc/mac.h | 1 - include/hw/arm/allwinner-a10.h | 1 - include/hw/arm/xlnx-zynqmp.h | 1 - include/hw/misc/mos6522.h | 1 - hw/arm/allwinner-a10.c | 1 + hw/arm/cubieboard.c | 1 + hw/arm/xlnx-zynqmp.c | 1 + 8 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/ide/ahci_internal.h b/hw/ide/ahci_internal.h index 95ecddcd3c..73424516da 100644 --- a/hw/ide/ahci_internal.h +++ b/hw/ide/ahci_internal.h @@ -25,6 +25,7 @@ #define HW_IDE_AHCI_INTERNAL_H =20 #include "hw/ide/ahci.h" +#include "hw/ide/internal.h" #include "hw/sysbus.h" =20 #define AHCI_MEM_BAR_SIZE 0x1000 diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h index a741300ac9..6af87d1fa0 100644 --- a/hw/ppc/mac.h +++ b/hw/ppc/mac.h @@ -30,7 +30,6 @@ #include "exec/memory.h" #include "hw/boards.h" #include "hw/sysbus.h" -#include "hw/ide/internal.h" #include "hw/input/adb.h" #include "hw/misc/mos6522.h" #include "hw/pci/pci_host.h" diff --git a/include/hw/arm/allwinner-a10.h b/include/hw/arm/allwinner-a1= 0.h index 7182ce5c4b..101b72a71d 100644 --- a/include/hw/arm/allwinner-a10.h +++ b/include/hw/arm/allwinner-a10.h @@ -7,7 +7,6 @@ #include "hw/timer/allwinner-a10-pit.h" #include "hw/intc/allwinner-a10-pic.h" #include "hw/net/allwinner_emac.h" -#include "hw/ide/pci.h" #include "hw/ide/ahci.h" =20 #include "sysemu/sysemu.h" diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h index 6cb65e7537..d7483c3b42 100644 --- a/include/hw/arm/xlnx-zynqmp.h +++ b/include/hw/arm/xlnx-zynqmp.h @@ -22,7 +22,6 @@ #include "hw/intc/arm_gic.h" #include "hw/net/cadence_gem.h" #include "hw/char/cadence_uart.h" -#include "hw/ide/pci.h" #include "hw/ide/ahci.h" #include "hw/sd/sdhci.h" #include "hw/ssi/xilinx_spips.h" diff --git a/include/hw/misc/mos6522.h b/include/hw/misc/mos6522.h index 03d9f0c059..493c907537 100644 --- a/include/hw/misc/mos6522.h +++ b/include/hw/misc/mos6522.h @@ -29,7 +29,6 @@ =20 #include "exec/memory.h" #include "hw/sysbus.h" -#include "hw/ide/internal.h" #include "hw/input/adb.h" =20 /* Bits in ACR */ diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c index 35e906ca54..3b0d3eccdd 100644 --- a/hw/arm/allwinner-a10.c +++ b/hw/arm/allwinner-a10.c @@ -16,6 +16,7 @@ */ =20 #include "qemu/osdep.h" +#include "exec/address-spaces.h" #include "qapi/error.h" #include "qemu/module.h" #include "cpu.h" diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c index f7c8a5985a..38e0ca0f53 100644 --- a/hw/arm/cubieboard.c +++ b/hw/arm/cubieboard.c @@ -16,6 +16,7 @@ */ =20 #include "qemu/osdep.h" +#include "exec/address-spaces.h" #include "qapi/error.h" #include "cpu.h" #include "hw/sysbus.h" diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index a60830d37a..0f587e63d3 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -24,6 +24,7 @@ #include "hw/boards.h" #include "exec/address-spaces.h" #include "sysemu/kvm.h" +#include "sysemu/sysemu.h" #include "kvm_arm.h" =20 #define GIC_NUM_SPI_INTR 160 --=20 2.21.0