From patchwork Sun Feb 25 17:16:36 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: 1903959 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=WSbB93Se; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TjVnn1RyLz23d2 for ; Mon, 26 Feb 2024 04:18:21 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1reI7c-0001z0-Ep; Sun, 25 Feb 2024 12:17:04 -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 1reI7a-0001y5-QZ for qemu-devel@nongnu.org; Sun, 25 Feb 2024 12:17:02 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1reI7S-0003xU-Vq for qemu-devel@nongnu.org; Sun, 25 Feb 2024 12:17:00 -0500 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-33d38c9ca5bso1190494f8f.2 for ; Sun, 25 Feb 2024 09:16:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708881413; x=1709486213; 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=IB72GIQk4y7cG3O6ov/QP+e0zW2l/wpZpAki6K0Zz7Q=; b=WSbB93SeNjSIvuV00OzhhVRXy5l3Q+K218e9/ZOKNWzzUXkzXUjyY8cPBPCkekK5z2 uzECSyQMJ/aLcn/X4cSywGxqPOE19BLbycLaavfApIMLcwJAIK5vK9IIfjFKN7dOoqGt 8P0evkps/zfOdhS+7OFifHkKFN+/FIwlQb9eLyBmSdg9VL2ffCIdjkO4+COYA5LspLbZ SaJ3VZTKg/PwU7ej5dR3nqyspJBrgX05nUXFIagdidmzo0MH0jNdwrmuer8tU7+cGQhV fnpHj+srX1yAuSQdCape+I+SfhENp2I2PC9S5+9aGxpDqBtjTqLt6gXf2W00/qoN5Toa HjOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708881413; x=1709486213; 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=IB72GIQk4y7cG3O6ov/QP+e0zW2l/wpZpAki6K0Zz7Q=; b=SHfRCzj2lamScy/95IwNzwHUHvHNQ8RAJnZlPILQZJ6pOoWwOUWRXmnwohMBO8jG15 v2ak09OT7zanna22vbwHyX+fVilWVYO/SAv1EB0X1WRK31/0II3ZD2kqNDjO7SbsC47x SJptsdNMlcn6JVuVfdhdben46ZjbilgewNjeEO0AheTf9sRFHNTg1c651PsonQ8nYFY7 qbk2P934L8+l5EbrYfCvOlmxUb0kVhnqr2PV5Su0jbPpglqFXO7uiwmyPMskCARBnb5o mQdGDPZRi3UnO+9bNm7UnGWZecep/QNP6afNGrp8aKdtk0ACenZpiT7PsOKbOkr1c2Ut Iowg== X-Gm-Message-State: AOJu0YyMI2Z+NVHyCnYM3BofSZ58DF/IDysZuE1WoH1SLQRXZjgeYgZO IK8z0LjJ6guDsrS7tzkhrlF8EizctRkz8x30QYc89xF/L2VKb5qWUsGZvKLqO92auR9lfcQS+8h F X-Google-Smtp-Source: AGHT+IEKGPwmclnZOKS+jFwzZr11phV87uKwzNOHt+KABKeGn7n8b2SQibxXFDsPtzF6/0ofwzc/YQ== X-Received: by 2002:a5d:6150:0:b0:33d:c5c7:4182 with SMTP id y16-20020a5d6150000000b0033dc5c74182mr2035191wrt.7.1708881413040; Sun, 25 Feb 2024 09:16:53 -0800 (PST) Received: from m1x-phil.lan ([176.176.164.69]) by smtp.gmail.com with ESMTPSA id u16-20020a5d6ad0000000b0033b6e26f0f9sm5570567wrw.42.2024.02.25.09.16.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 25 Feb 2024 09:16:52 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Leif Lindholm , Marcin Juszkiewicz , BALATON Zoltan , Radoslaw Biernacki , qemu-arm@nongnu.org, Peter Maydell , qemu-block@nongnu.org, John Snow , Mark Cave-Ayland , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth Subject: [PATCH v2 2/3] hw/ide: Remove last two uses of ide/internal.h outside of hw/ide/ Date: Sun, 25 Feb 2024 18:16:36 +0100 Message-ID: <20240225171637.4709-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240225171637.4709-1-philmd@linaro.org> References: <20240225171637.4709-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.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, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.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 995c7be23e..aa1eeecc94 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"