From patchwork Wed Feb 21 21:16:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 774535 Delivered-To: patch@linaro.org Received: by 2002:a5d:6ac2:0:b0:33b:4db1:f5b3 with SMTP id u2csp464181wrw; Wed, 21 Feb 2024 13:32:08 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWOT5dDqyMyUBz/2C+AhSHVBw2Um7uVgRifXw0W+0V3dykeSi+sc0W3Ot8SqoZE4yzv8EmRK8nrIUUpnNIcy9rx X-Google-Smtp-Source: AGHT+IFLjR17KiP0cqbh4iRlFrB5hmZ7tTqhEy78ek8izvgQLi/1tTuBFh+9dj/GREBQlLNQ8fFJ X-Received: by 2002:a05:620a:1a24:b0:787:2e2b:a78f with SMTP id bk36-20020a05620a1a2400b007872e2ba78fmr1151985qkb.33.1708551127826; Wed, 21 Feb 2024 13:32:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708551127; cv=none; d=google.com; s=arc-20160816; b=qfjCq2pUo+Nf1dntKOtlilybkN0uTfFejkMVmFKD+4m2XW8oa4mvogoRFyvCtrSucd WvVpuXQPrItzNANeThRaR6udeEAmLBlkv0Rb3MizqAqDJOhf7SiZG9ooSHxZTwlpwlmK XWONZ1crTG/PjLMBQc8Ox345+sNr5ylIWB0AIxX+cEqvTtizh6wBbF52c3wmH3/Mwqi6 JCOw3yAhZIFs3F/oqetNmZrWEJ3FOnN0yz3D8PHP3dUOOmSvPBXM2b7myjc/59fWV0Jd DijfCypkCGanHlieGS5ox0cRCIphIYuR7HD6ztyuvXBGnk9rHup0y9RBUYk2S9Wh7hHk 2JLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=bSyJnKQkd93ud2FmPgc+3hwMsxOVnxzVCD11CZAAcfk=; fh=+X8R+e3mbgU3IshgdSHlFTALwQAZEUfmYK2Jo0JZy3M=; b=a22bNhaFi7GrbvJwwBgSG2DlGvNbMMIhKAxvYvv+9sIxsTUBYRH8tTL3O7zQZX1Jxs Rt+/Q2bxt6k0CGDJQoKRC13g/KxTwRQPpBJekcmhf8G+h5j0uDyvn5CqjwyktjU3i9Se Havp7xqTXOXD8vrh01+kEoX144glT4PblT32KTnmTaDPepBJhCKHpLL7a9O5E8LSCWKz 55UBfxXEBUDZR4dLdMO3v8OB9OKqpbAoFOvdcCVwWYiSqyzo0hbtA4DGzcj1sTNUBZEq Ew1ifeoDhtdHVhlLRw3cwci2QqXI4n0K2L8y+MVsVQ+y2eIVjQveubRfEA7X8t4x0G0F jVng==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="dHP54ZK/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p6-20020a05622a13c600b0042db3db25afsi12610179qtk.773.2024.02.21.13.32.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Feb 2024 13:32:07 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="dHP54ZK/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcu0V-0006B5-Ek; Wed, 21 Feb 2024 16:19:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rctzx-0004a3-4R for qemu-devel@nongnu.org; Wed, 21 Feb 2024 16:19:26 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rctzt-0001NV-Fl for qemu-devel@nongnu.org; Wed, 21 Feb 2024 16:19:23 -0500 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-33d44d78e5fso2020285f8f.1 for ; Wed, 21 Feb 2024 13:19:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708550359; x=1709155159; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bSyJnKQkd93ud2FmPgc+3hwMsxOVnxzVCD11CZAAcfk=; b=dHP54ZK/SlQkPy6n53VV6BW/1UlH9FWQ60TCS3VMtPP+u/C8oTFzu0a9U/yOQi9s2W p79JQeFoWa2fD2A38Bvzxvc+fQASyrF0hOJs1ZbODUFoOpCoZiLWXyktXhPSaR0Vpqq7 vu3P3K0ipKmR/oS1faGh/ReXUVlv5LZeZ/jjVzENn986KKME0zOA3tR6fORxMi7E0uNb L5FFE2YCTLFOWspEZW70Fe8in7tfBv6vCY+m+Nh4bvk6EMg6NMoMg5L6CQfLfviuVJh6 VA8OqKhtxGlj5VR156Ec67IWaxU5NbXfFMkacvkCgHi0JtJ85RznwHQmeHz/U0rvKc4O 9MgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708550359; x=1709155159; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bSyJnKQkd93ud2FmPgc+3hwMsxOVnxzVCD11CZAAcfk=; b=udku5VdIeK0GTtinn2bPa4pWOT4TZDLhywt1p1kLBSglqDak5X5+1WhTeZUvbW8FY6 ZMHsqj0j6/H6yTjJi/dRURJzyQTaNDkr0x1P0t8jsfzUF8Ic9BaU6Z3CXphSxoA0lbFa CD2S32CoU9eaDWDcwY/jHTIoQMI3eI7vjhfyg72QryfCAYC8zQLos/CIqQ9DGTghR8hM FeK+SuUlWMCbRDj9ujw1IiC6aADCfl4Y7Kn5wOHvx+IuhCQBWK+zYQy36jEjWECqbJ5d aicF95ypX2JqvWfkiQ0odXhI8m+JkDYljVbu1hPMpgbqKfnFLqxg8gbEOtX4GD6zlpqe Kwdg== X-Gm-Message-State: AOJu0Ywa83cE76qpNpRKtfTIHJRLGCD/9HLuppI0j/FWlFS4N9/X+AZb r9DpjSD0UAfBpHK8VMRQy+lQziDiYdeYBEMfMoDdaHO0yol3zTe7LdOqff/So3Wx00R1nPi65Jd 3fac= X-Received: by 2002:adf:fc90:0:b0:33d:3566:b5d1 with SMTP id g16-20020adffc90000000b0033d3566b5d1mr9489249wrr.57.1708550358803; Wed, 21 Feb 2024 13:19:18 -0800 (PST) Received: from m1x-phil.lan ([176.187.211.34]) by smtp.gmail.com with ESMTPSA id p6-20020adfe606000000b0033cdbe335bcsm18113801wrm.71.2024.02.21.13.19.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 21 Feb 2024 13:19:18 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-block@nongnu.org, qemu-ppc@nongnu.org, Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Mark Cave-Ayland , Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum , John Snow , BALATON Zoltan Subject: [PULL 24/25] hw/ide: Stop exposing internal.h to non-IDE files Date: Wed, 21 Feb 2024 22:16:24 +0100 Message-ID: <20240221211626.48190-25-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240221211626.48190-1-philmd@linaro.org> References: <20240221211626.48190-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Thomas Huth include/hw/ide/internal.h is currently included by include/hw/ide/pci.h and thus exposed to a lot of files that are not part of the IDE subsystem. Stop including internal.h there and use the appropriate new headers ide-bus.h and ide-dma.h instead. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth Acked-by: Mark Cave-Ayland Message-ID: <20240220085505.30255-8-thuth@redhat.com> Signed-off-by: Philippe Mathieu-Daudé --- include/hw/ide/pci.h | 2 +- hw/i386/pc.c | 2 +- hw/ide/cmd646.c | 1 + hw/ide/pci.c | 1 + hw/ide/piix.c | 1 + hw/ide/sii3112.c | 1 + hw/ide/via.c | 1 + 7 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/hw/ide/pci.h b/include/hw/ide/pci.h index a814a0a7c3..ef03764caa 100644 --- a/include/hw/ide/pci.h +++ b/include/hw/ide/pci.h @@ -1,7 +1,7 @@ #ifndef HW_IDE_PCI_H #define HW_IDE_PCI_H -#include "hw/ide/internal.h" +#include "hw/ide/ide-bus.h" #include "hw/pci/pci_device.h" #include "qom/object.h" diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 1ee41a5e56..f8eb684a49 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -31,7 +31,7 @@ #include "hw/i386/fw_cfg.h" #include "hw/i386/vmport.h" #include "sysemu/cpus.h" -#include "hw/ide/internal.h" +#include "hw/ide/ide-bus.h" #include "hw/timer/hpet.h" #include "hw/loader.h" #include "hw/rtc/mc146818rtc.h" diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index c0bcfa4414..23d213ff01 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -33,6 +33,7 @@ #include "sysemu/reset.h" #include "hw/ide/pci.h" +#include "hw/ide/internal.h" #include "trace.h" /* CMD646 specific */ diff --git a/hw/ide/pci.c b/hw/ide/pci.c index ca85d8474c..73efeec7f4 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -30,6 +30,7 @@ #include "sysemu/dma.h" #include "qemu/error-report.h" #include "qemu/module.h" +#include "hw/ide/internal.h" #include "hw/ide/pci.h" #include "trace.h" diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 4e5e12935f..1773a068c3 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -30,6 +30,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/pci/pci.h" +#include "hw/ide/internal.h" #include "hw/ide/piix.h" #include "hw/ide/pci.h" #include "trace.h" diff --git a/hw/ide/sii3112.c b/hw/ide/sii3112.c index 63dc4a0494..321b9e46a1 100644 --- a/hw/ide/sii3112.c +++ b/hw/ide/sii3112.c @@ -13,6 +13,7 @@ */ #include "qemu/osdep.h" +#include "hw/ide/internal.h" #include "hw/ide/pci.h" #include "qemu/module.h" #include "trace.h" diff --git a/hw/ide/via.c b/hw/ide/via.c index 3f3c484253..cf151e70ec 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -25,6 +25,7 @@ */ #include "qemu/osdep.h" +#include "hw/ide/internal.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "qemu/module.h"