From patchwork Mon Feb 26 08:06:30 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: 775830 Delivered-To: patch@linaro.org Received: by 2002:a5d:6103:0:b0:33d:da16:65b6 with SMTP id v3csp213582wrt; Mon, 26 Feb 2024 00:07:43 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCW8Tpz5s8seCjgQDjUu5BtulZp0MnnXaEBRRMYC3qyBCZFcseF/Ft1KKoueiqZotDdt0KCnF4sdGIvART0qqX4m X-Google-Smtp-Source: AGHT+IGnZsn2jUxKS5inr58TCSCuiAul2n6CDBnwBcvREuYwZUqcutqfHbq4+kS4dOE/PX3WqKc5 X-Received: by 2002:a05:6808:23c8:b0:3c1:a87b:745 with SMTP id bq8-20020a05680823c800b003c1a87b0745mr147855oib.34.1708934863168; Mon, 26 Feb 2024 00:07:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708934863; cv=none; d=google.com; s=arc-20160816; b=xCcmECAhm6YjhIU0me7lagL3zeqzHnIh4VTVQj6PJ+fZm8dPQarmSvlZc9FPOiOYYV ohGf9mCHQjth1t78vsypESOEFYzadqov9S3Hz+caeY4gpXu5GG2k1p3G/VmJS7RE0wXQ wbAMsdVShcveNJ0QCzFQkH9x5l7e/6uP0/4uh24dNOJfcFGouNgx6fd6tceWuRWehA45 dYGpSV44jsJaDmaIZsYEdmaYiTq7w86ZTqyWGUmlK5Ig18jKhdvdGVkGCz4uRWGDEun3 LpOssIjqJzQlMgXTSHjdMPlz6Pff6ZEoq+15xTxSH6AGODMfzLaCqOKZJeGmdxGnnx1k GWJA== 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=scR0cVRlUQ+FFZFfcolEQrGBOQjFaxkZH3KxNR75t0E=; fh=aca9rmgxlinIxdMK28VrYARx0UGg95c8ASgjU1Eo5Ds=; b=e7xAI51d/UNShc4HVoFVWVrQX3viZLOqqcZrigC5nJRQ6x7wHTgdxXK42yIludPF0I i6r7aACNJ7jjSqdW5rMVebDM3Q3nbSqNqXFfuoTpQD8rj5se/xKuH81y+mmZ3JhxtUff umhAbD+cUwrwYoJ6LdL1JsVvm6dWS6G2CC0aIoul1Mz4WhrPhn19uSHRyStSjZyNKnAR clO4z5krcqphR9p9+T0/eoApCYthyeoC6OBk82Gf7ch+WuSwiDgArEzLIvw7wDrwsuj/ lw0oHiFWXqwMOVDxBbMzv4eK2PMMpcRAJfRRdHR71HNF/AaBDqveVzOPxJESkL2WLFWa SmjQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eYZzuphj; 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 j14-20020ac8550e000000b0042e76ff433asi3897701qtq.321.2024.02.26.00.07.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Feb 2024 00:07:43 -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=eYZzuphj; 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 1reW0m-0004g6-VA; Mon, 26 Feb 2024 03:06:56 -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 1reW0l-0004eh-CH for qemu-devel@nongnu.org; Mon, 26 Feb 2024 03:06:55 -0500 Received: from mail-lj1-x233.google.com ([2a00:1450:4864:20::233]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1reW0j-0001dF-5B for qemu-devel@nongnu.org; Mon, 26 Feb 2024 03:06:55 -0500 Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2d109e82bd0so32792231fa.3 for ; Mon, 26 Feb 2024 00:06:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708934811; x=1709539611; 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=scR0cVRlUQ+FFZFfcolEQrGBOQjFaxkZH3KxNR75t0E=; b=eYZzuphjZKw3vm3Rf8/6HUtXUzPpf6O1Y/rIvn3QmnlaSKM8PRADxCIU2psatcc667 MuYVgjp3lf38Kn8NaWbzpDaHAIy1vFiS/AdTHOZyOxUIwwVc1ZtbA4yzoat34yKIkPvU g8GDjxGmZNlQu6/9yhiQbm7pG1gMXDeF3WyzcoN1BLN7U17klCnRKM4F/AqIztP7iHd7 tvYK1wUDo9koPgyU3ysu2qh0xzHcsO6qPRi8tUfvP2j5/5ZyGGna7B3kndBuKipduFDK UuxKulDKV1jRFiGudE7t0Gq3AlO1exCEu+kIFfgeEOeZBaj3f/ORr7OQAunBllxwK2Kt 1L+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708934811; x=1709539611; 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=scR0cVRlUQ+FFZFfcolEQrGBOQjFaxkZH3KxNR75t0E=; b=euTvtk61Rm4lUm73LFhP97VSqtkzJ+1mq7JpTMRtnXr7bTINRDurx6xP1rzsUUkT+G VgsFYnwkXHjc/8atp8R4qH/15p6Uq4IkgiVWjcvl+f0p1RPcmIZlydXHV5vrDHPoDXDM KP+v32v1XKcamMX/46Ib2siEZvlzwLZXgdcM+r2rl7hea40/XcA+nLQbzAo5MmXyVr8H i6YWkYhVERcT+DXzacO6JhoXZYXr/JMpITtDS9Dg50t7dGa6MyT5cs1L21Gxo4SmbBWx UcGkUjgFIx5Cbhdo2hET80pc1YQv9dzUMUnl/MOly7U59RI0pRYdtZi+stbv9foIHAfS kt5Q== X-Gm-Message-State: AOJu0Yzy2E9p3X12Yembk1Ez/SOYUmtqooOILlkZli0f6HoDJgLhLOtP rjv9xc7ge3QFjTZ8TssTxOFHefDmh7H2rLtHryVWNIug020DWnodTMrtd6WhcHtrFihzAsMrrz3 h X-Received: by 2002:a05:6512:3290:b0:512:dc3d:6bf8 with SMTP id p16-20020a056512329000b00512dc3d6bf8mr2955095lfe.56.1708934811087; Mon, 26 Feb 2024 00:06:51 -0800 (PST) Received: from m1x-phil.lan ([176.176.164.69]) by smtp.gmail.com with ESMTPSA id z1-20020a056512376100b00512d252759bsm756622lft.212.2024.02.26.00.06.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 26 Feb 2024 00:06:50 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Mark Cave-Ayland , Marcin Juszkiewicz , John Snow , Leif Lindholm , qemu-block@nongnu.org, Radoslaw Biernacki , BALATON Zoltan , qemu-ppc@nongnu.org, Peter Maydell , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Thomas Huth Subject: [PATCH v3 2/3] hw/ide: Remove last two uses of ide/internal.h outside of hw/ide/ Date: Mon, 26 Feb 2024 09:06:30 +0100 Message-ID: <20240226080632.9596-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240226080632.9596-1-philmd@linaro.org> References: <20240226080632.9596-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::233; envelope-from=philmd@linaro.org; helo=mail-lj1-x233.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: BALATON Zoltan Remove last two includes of hw/ide/intarnal.h outside of hw/ide and replace them with newly added public header to allow moving internal.h into hw/ide to really stop exposing it. Fixes: a11f439a0e (hw/ide: Stop exposing internal.h to non-IDE files) Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Message-ID: <20240223142633.933694E6004@zero.eik.bme.hu> Signed-off-by: Philippe Mathieu-Daudé --- {include/hw => hw}/ide/internal.h | 0 include/hw/misc/macio/macio.h | 2 +- hw/arm/sbsa-ref.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename {include/hw => hw}/ide/internal.h (100%) diff --git a/include/hw/ide/internal.h b/hw/ide/internal.h similarity index 100% rename from include/hw/ide/internal.h rename to hw/ide/internal.h diff --git a/include/hw/misc/macio/macio.h b/include/hw/misc/macio/macio.h index 86df2c2b60..2b54da6b31 100644 --- a/include/hw/misc/macio/macio.h +++ b/include/hw/misc/macio/macio.h @@ -28,7 +28,7 @@ #include "hw/char/escc.h" #include "hw/pci/pci_device.h" -#include "hw/ide/internal.h" +#include "hw/ide/ide-bus.h" #include "hw/intc/heathrow_pic.h" #include "hw/misc/macio/cuda.h" #include "hw/misc/macio/gpio.h" diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 4a59e2fd37..13dde50cba 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -36,7 +36,7 @@ #include "hw/arm/smmuv3.h" #include "hw/block/flash.h" #include "hw/boards.h" -#include "hw/ide/internal.h" +#include "hw/ide/ide-bus.h" #include "hw/ide/ahci-sysbus.h" #include "hw/intc/arm_gicv3_common.h" #include "hw/intc/arm_gicv3_its_common.h"