From nobody Mon Feb 9 16:12:41 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1564142793; cv=none; d=zoho.com; s=zohoarc; b=IOzQ8d1LgbL6Gju+CPUL/rNf18+BrZR4fuYpzgUytsqh/hehDCa+/4m3QVakyZDKf54PTAoPPcXxQfNKD1djjTQR+Mnw7wPhUjK1sfoaByEnQMBaTvydSF5Clk52mCNBCad10u6OeVXNelDq2D28EDSOb0eoQA4ZW/P4EUaVjU8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564142793; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=YIRY2LqntpDE5RVemolvJcuY4EYCOrSU+2pAHC+5AXw=; b=b9z4qK8lIdQ+kmEFAiBK6iYe1zCcj/PPhkF8FD+Ffg3w+j3uyYafuKNdMsrH9hG2X1ftAZWwplxvlCfUgIYQa1YOZDLddJELNYVLOzZ0rzgH852p0iesPM4lYG3bXE3dhGdU97ZC2lD3Dzvw+EdfcFmuv4n4y10ZZC2iEZxBqYM= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564142793927517.2875056196297; Fri, 26 Jul 2019 05:06:33 -0700 (PDT) Received: from localhost ([::1]:39220 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyzW-0006sV-CJ for importer@patchew.org; Fri, 26 Jul 2019 08:06:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58427) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyys-0005Vb-VQ for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyyq-0007uJ-3l for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45988) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyyp-0007qk-Pf for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:47 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E80595AFE3 for ; Fri, 26 Jul 2019 12:05:45 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8F8A060A35 for ; Fri, 26 Jul 2019 12:05:45 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 935FA1132B4B; Fri, 26 Jul 2019 14:05:42 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:24 +0200 Message-Id: <20190726120542.9894-11-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 26 Jul 2019 12:05:45 +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] [PATCH 10/28] 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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. Signed-off-by: Markus Armbruster --- hw/arm/allwinner-a10.c | 1 + hw/arm/cubieboard.c | 1 + hw/arm/xlnx-zynqmp.c | 1 + 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 - 8 files changed, 4 insertions(+), 4 deletions(-) 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 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-a10.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 */ --=20 2.21.0