From patchwork Mon Feb 26 08:06:29 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: 775833 Delivered-To: patch@linaro.org Received: by 2002:a5d:6103:0:b0:33d:da16:65b6 with SMTP id v3csp213772wrt; Mon, 26 Feb 2024 00:08:15 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVlOdMFgHKSVTas+Sjpla6/b/+eUJBBmC09hSE4XrpDZqzO5DliTdiaqOCAlZEAqeJ80SV4Him0GJv2el2W66/g X-Google-Smtp-Source: AGHT+IHQfJDhbvQRoTdrqZM7FHeGH41kcoW1QhPBx/v5tBjpBZSKgCHAViGHQfPRCrjCL/7PL8ny X-Received: by 2002:ae9:e113:0:b0:783:20c4:663f with SMTP id g19-20020ae9e113000000b0078320c4663fmr5870948qkm.67.1708934895048; Mon, 26 Feb 2024 00:08:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708934895; cv=none; d=google.com; s=arc-20160816; b=r7ieeK2KPCRP33ivzEaGioi9EdH8ci+G59sUWviSrz1fs1DKMJkvMNaPLXB/N4+At2 0miWxpr2er6SuJaGytRnqKvtzFcDl56ctNpyumBhxB/l2axijIGSxld13kTYLo1ghIXV xa7zq9p8URSHcQ1LGl+W+sIqtOitmVSOxpEBUNbxyy2jpEdNxccsu3qSm2QvGQDiSZ5d VXKMxPaSV/tVK60mz/G+zKG6bOt8+/XTQcWhTQk8Ck/7sCYR6tUslggXH24rEqTlVmWp khci9N0/UOPDH53yPjGSX8HyCxjbSZPqGsjO1P1sZhqot3xFc9prhXFtbQ0vF3EmSlA4 FIag== 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=TW5vUBh5Q5ZFKmDEE6klQHKiK8fu6o3OGFQfw41qJcU=; fh=aca9rmgxlinIxdMK28VrYARx0UGg95c8ASgjU1Eo5Ds=; b=fgH4e1xH9BlywfiDoe9A8W4Q5kCpWG8WYjMsgnNizzpVeuInu3Z4MzTHFy7/rluwis GK0qlk0KTb5sWiZ1pR4EFSqe1cpR0jM4K4LUIBQjzZdLu22QGBtcKutC8GGcBp9JlYbR ndMA92w/uAdQITAviz0Bc7rOggPJkEg3BwwDYanmC75dqVmr/ibxxP2M+9hm9WwYRMA9 NsD3qmFstJbHT1ZNBl63lkn+llaWutwVZiXJ5tZm55CM8lUxGOsyVWGlsD7fSALWYqtv xS52hHpnvxie4nc71Xw0Ynd27eO6JOvGtmalKStrBXOzRQ1zJzJGMULxf8M7wZNSNrf0 CQFg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dnkuiS03; 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 a9-20020a05620a16c900b00787ab4f02f7si4440685qkn.204.2024.02.26.00.08.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Feb 2024 00:08:15 -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=dnkuiS03; 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 1reW0g-0004bM-3N; Mon, 26 Feb 2024 03:06:50 -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 1reW0e-0004ad-PQ for qemu-devel@nongnu.org; Mon, 26 Feb 2024 03:06:48 -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 1reW0c-0001cU-8M for qemu-devel@nongnu.org; Mon, 26 Feb 2024 03:06:48 -0500 Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2d28051376eso19479631fa.0 for ; Mon, 26 Feb 2024 00:06:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708934804; x=1709539604; 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=TW5vUBh5Q5ZFKmDEE6klQHKiK8fu6o3OGFQfw41qJcU=; b=dnkuiS03buxQQpV7IkRbudnH6i3SNEk33ahUQLNW86E8Yytgwmfi1Ng9t83TJKSZqC EdhXg2JuX0yV+Lq7k+3VvLtOqKxCfHev4oVJH0erlBuhNYdr1YAj4czF9UYHB2kT0/JB 0CDFrfAj50i11DeOu/lNZ6tnqEqGt+Iuu5I7hhNfQeTUHuo4XRAZ4X1S6sTm4ZQSOkE8 XubtNTmuZJe8YEh3Z64ZhRhWEm4mQXThogTzyDZHQNlGT9RCbL8kuZb5yE/HGPoQ/qKO KiTGUBRb09flanpZDt9x2FFVy5pvPMoV9XdDJP/uxZZ5EmkcCm/eHJxE26EE15Rncnls 6LHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708934804; x=1709539604; 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=TW5vUBh5Q5ZFKmDEE6klQHKiK8fu6o3OGFQfw41qJcU=; b=Hrs4yZUt4ttsgP8D9byGOel4OoP2ut6mZ3ryj7//z/btB2ZxGcHUhqZxdFKvfapHVi n3/IJlRpZS3UQx7VCv0Wlf+SeLRonldpRy1urEHSFGqa7qQG73Nz7XroonQcSUw4NqOb UKhotSPbWl3uqtPVQhtcIp9UErhiMiMOsIeP05XlKvtqLwlcyo4NmURtOBnpzS7/4Clk SMwb4XmAIKveq1c9XYKws7g5/joyTh3kJIv4CoXWYAvBr4lmghj14HkfS/epSzUOZmlo r5qaAw47bEbirwFktfjDf4pI16NpPtgvQeIuPWAj6qohXbc+4bk6LKe3hsF8uV8irS8V nLVg== X-Gm-Message-State: AOJu0YwEozaprml8xsHts+ps0JnUck8ZZ3VMs2Ibn5N18t4WzxqbD6mF xpieGGbu8Y1pDWSZRUqP3uwA9G/P3Q+0bogb5T/Zvh8ExMZzQL1cUV4C9e4JZHHquRRJFZFwOXp 7 X-Received: by 2002:a05:651c:509:b0:2d2:8b07:cca5 with SMTP id o9-20020a05651c050900b002d28b07cca5mr1359774ljp.39.1708934804005; Mon, 26 Feb 2024 00:06:44 -0800 (PST) Received: from m1x-phil.lan ([176.176.164.69]) by smtp.gmail.com with ESMTPSA id k5-20020a2e8885000000b002d2671dec20sm790389lji.99.2024.02.26.00.06.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 26 Feb 2024 00:06:43 -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 1/3] hw/arm/sbsa-ref: Do not open-code ahci_ide_create_devs() Date: Mon, 26 Feb 2024 09:06:29 +0100 Message-ID: <20240226080632.9596-2-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 Use ahci_ide_create_devs() instead of open-coding it. Not accessing AHCIDevice internals anymore allows to remove "hw/ide/ahci_internal.h" (which isn't really a public header). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- hw/arm/sbsa-ref.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 5d3a574664..4a59e2fd37 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -37,7 +37,6 @@ #include "hw/block/flash.h" #include "hw/boards.h" #include "hw/ide/internal.h" -#include "hw/ide/ahci_internal.h" #include "hw/ide/ahci-sysbus.h" #include "hw/intc/arm_gicv3_common.h" #include "hw/intc/arm_gicv3_its_common.h" @@ -571,8 +570,6 @@ static void create_ahci(const SBSAMachineState *sms) DeviceState *dev; DriveInfo *hd[NUM_SATA_PORTS]; SysbusAHCIState *sysahci; - AHCIState *ahci; - int i; dev = qdev_new("sysbus-ahci"); qdev_prop_set_uint32(dev, "num-ports", NUM_SATA_PORTS); @@ -581,14 +578,8 @@ static void create_ahci(const SBSAMachineState *sms) sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, qdev_get_gpio_in(sms->gic, irq)); sysahci = SYSBUS_AHCI(dev); - ahci = &sysahci->ahci; ide_drive_get(hd, ARRAY_SIZE(hd)); - for (i = 0; i < ahci->ports; i++) { - if (hd[i] == NULL) { - continue; - } - ide_bus_create_drive(&ahci->dev[i].port, 0, hd[i]); - } + ahci_ide_create_devs(&sysahci->ahci, hd); } static void create_xhci(const SBSAMachineState *sms) 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" From patchwork Mon Feb 26 08:06:31 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: 775831 Delivered-To: patch@linaro.org Received: by 2002:a5d:6103:0:b0:33d:da16:65b6 with SMTP id v3csp213583wrt; Mon, 26 Feb 2024 00:07:43 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU8GQQ/HmJmmsJXa+rJQ2bqtK4DY3HCJqFS2FV8NL/+HP7GSsTSoC68g9xM8i9Igocz4uK43LnQ3oTTM5KNSju6 X-Google-Smtp-Source: AGHT+IFs+73ASKZ3ii2lf8D/F+gC2dqKmruJpsfUBJsMfbsOVrw1+0ym9qi0R4c6uVSjKz5tpy5A X-Received: by 2002:ac8:598e:0:b0:42e:7ea3:dcbd with SMTP id e14-20020ac8598e000000b0042e7ea3dcbdmr4683975qte.29.1708934863398; 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=t6RJan3kzG++RFTXS46jYqm2fyNFGbo2PNvCc/jj1bxXRjPkUTF1XQT5z9t3sJO8HW HSqqH1FC8aXKB0lWx3JUHRmJSK6C+Hwb++699rHIua63lzQnuARkPgZUc1sn6BkhR9pN YwHCiZCLOqemNhyPgYcNpeBLyAhBvUomLD1JoYpq6TuIVGfqAoiMFZfDmyOEEbRW2xLL GpGybQI92sDNtFG6OSCWLrHBEmAEp66OMAKhMxRBYFohOWuDWs6IRlCa1NKf46B8qAX8 lmKURHMNfWVwyrJME/an8RQHP9uHSma3obLmyCJ6dZU1DLX6zALSh5T8orc7cMUj6VVs 8wQQ== 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=cNMtYfnXorOc38D7J1SGsfvj3HH829VNJ1q+mi/Zf5o=; fh=mjuSup+hwjtLXqK/ySKb9Dbl7jNMbqLUaLLXZTKGB0M=; b=D4fM4xXpbJGOI30nhiZkpASGsqe1/x159ORM5R+6AnZ33MZULINqX3dSwwWjTcw3Pg huDlHrv29XV/qcK42CMMXCGpBRA/J1ZUINJm7K8A2T2XQc4cJ3aIiYccPfvD7M+HPuYg xaa65lmwG7YO6cyxSKErcSH6DF2YGa0wjsFfaYYSx6e5mkGmyVLdoKohAVN1bqon871U QexhnlP3lKlgtrNKSESEmNn1Qt4xZyLjDSvwJcyECWJssiYe8JEbj3N3ry2wko4RQXQd 4/PUNlTjSlVqW7sxS76GZP0h42VMfN3gF5zce69mXBlhjtWqHqW2kAYcPD+xudpfFlfk oQFw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zxJVzfBE; 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 g18-20020ac870d2000000b0042da946f329si4478302qtp.738.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=zxJVzfBE; 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 1reW0u-0004jx-C7; Mon, 26 Feb 2024 03:07: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 1reW0t-0004io-G5 for qemu-devel@nongnu.org; Mon, 26 Feb 2024 03:07:03 -0500 Received: from mail-lj1-x234.google.com ([2a00:1450:4864:20::234]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1reW0q-0001e9-Bt for qemu-devel@nongnu.org; Mon, 26 Feb 2024 03:07:03 -0500 Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2d228a132acso35826211fa.0 for ; Mon, 26 Feb 2024 00:06:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708934818; x=1709539618; 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=cNMtYfnXorOc38D7J1SGsfvj3HH829VNJ1q+mi/Zf5o=; b=zxJVzfBEvmeoiFyzksIXXkqZybYc4zfiBk2veMJuCC5uCWmFATJXsHOQfpDFyapxfA 3sH7M1IvlUYj3QvhDBxvN9vw4m56xOn8K9KetbFSlXEoEhR7e79A2ndGSdC5F5mo0jyy m4fRoY3RodY4BP/7vEs7z4UVobR4xldTBCJEGhCOiG1N6qDzXxq1xt4tgY5dyqqF54v/ ZQAynzL78kEI0ZhBiJNQJzzq3HaefJANFJWfMtDd2yQeex/71kaxitF2IzsXZXQAWWTE 1u7tdabiJ3krDYx5NcTixiW88Z7lNKNZ/Xj5F7Ig1twBf9XJFRR7zM+WJD3nzY5ErvO7 3SAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708934818; x=1709539618; 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=cNMtYfnXorOc38D7J1SGsfvj3HH829VNJ1q+mi/Zf5o=; b=KvenQiOzjq59OjBmlf7TcbFhQvweMT9H15LTZuPFxrmDHK9tNL8gptWGm/7IAKFtQ6 0/6JvnV9lBFoTqfwsiqst5PmaLMCSrWI/75oVQtYyaXJKS9n2kmftgIcIEBA8O05C2mU klaERIIykXMJ83ohMRUVjaBHvjBxmm+ZXvSDifzA3XYDbUsEP6OxwD6cF74ZOn847idr E4BjTZKnsDmWtMFiK4tKKpT/KBgH0QfrieyKcVhjtANk2BhUPoTUS9kUZ67Z3JIYXrG2 gTT784QscRgVkMigjsSH0SE3EkhHWwQ2SBeCZR4BCgloDvakJKsH2CkZGYx8FLDYSej1 /WyQ== X-Gm-Message-State: AOJu0YxAeOnpu7cfL+Root+0ag0k7r+6yGcTcJ5NfzNYD9UC5aOoKowv 7FD3wDR89Aq8XVhEQYPk3fkhhLnpYNOQYsLNMNJxYzHies1AGnx9KaO3T+WGkUeJvEr4tQ2hUq/ / X-Received: by 2002:a05:6512:acc:b0:512:f892:7f0c with SMTP id n12-20020a0565120acc00b00512f8927f0cmr1980949lfu.38.1708934818267; Mon, 26 Feb 2024 00:06:58 -0800 (PST) Received: from m1x-phil.lan ([176.176.164.69]) by smtp.gmail.com with ESMTPSA id d20-20020ac25454000000b0051300b6a1casm85182lfn.84.2024.02.26.00.06.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 26 Feb 2024 00:06:57 -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?= Subject: [PATCH v3 3/3] hw/ide: Include 'ide_internal.h' from current path Date: Mon, 26 Feb 2024 09:06:31 +0100 Message-ID: <20240226080632.9596-4-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::234; envelope-from=philmd@linaro.org; helo=mail-lj1-x234.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 Rename "internal.h" as "ide_internal.h", and include it via its relative local path, instead of absolute to the project root path. Signed-off-by: Philippe Mathieu-Daudé --- hw/ide/ahci_internal.h | 2 +- hw/ide/{internal.h => ide-internal.h} | 0 hw/ide/ahci.c | 2 +- hw/ide/atapi.c | 2 +- hw/ide/cmd646.c | 2 +- hw/ide/core.c | 2 +- hw/ide/ide-bus.c | 2 +- hw/ide/ide-dev.c | 2 +- hw/ide/ioport.c | 2 +- hw/ide/isa.c | 2 +- hw/ide/macio.c | 2 +- hw/ide/microdrive.c | 2 +- hw/ide/mmio.c | 2 +- hw/ide/pci.c | 2 +- hw/ide/piix.c | 2 +- hw/ide/sii3112.c | 2 +- hw/ide/via.c | 2 +- 17 files changed, 16 insertions(+), 16 deletions(-) rename hw/ide/{internal.h => ide-internal.h} (100%) diff --git a/hw/ide/ahci_internal.h b/hw/ide/ahci_internal.h index 4e13329bb2..7e63ea2310 100644 --- a/hw/ide/ahci_internal.h +++ b/hw/ide/ahci_internal.h @@ -25,8 +25,8 @@ #define HW_IDE_AHCI_INTERNAL_H #include "hw/ide/ahci.h" -#include "hw/ide/internal.h" #include "hw/pci/pci_device.h" +#include "ide-internal.h" #define AHCI_MEM_BAR_SIZE 0x1000 #define AHCI_MAX_PORTS 32 diff --git a/hw/ide/internal.h b/hw/ide/ide-internal.h similarity index 100% rename from hw/ide/internal.h rename to hw/ide/ide-internal.h diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 54c9685495..b8123bc73d 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -34,11 +34,11 @@ #include "qemu/module.h" #include "sysemu/block-backend.h" #include "sysemu/dma.h" -#include "hw/ide/internal.h" #include "hw/ide/pci.h" #include "hw/ide/ahci-pci.h" #include "hw/ide/ahci-sysbus.h" #include "ahci_internal.h" +#include "ide-internal.h" #include "trace.h" diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index dcc39df9a4..73ec373184 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -24,10 +24,10 @@ */ #include "qemu/osdep.h" -#include "hw/ide/internal.h" #include "hw/scsi/scsi.h" #include "sysemu/block-backend.h" #include "scsi/constants.h" +#include "ide-internal.h" #include "trace.h" #define ATAPI_SECTOR_BITS (2 + BDRV_SECTOR_BITS) diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 23d213ff01..8cebd1b63d 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -33,7 +33,7 @@ #include "sysemu/reset.h" #include "hw/ide/pci.h" -#include "hw/ide/internal.h" +#include "ide-internal.h" #include "trace.h" /* CMD646 specific */ diff --git a/hw/ide/core.c b/hw/ide/core.c index 9c4a812902..130c4d8865 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -41,7 +41,7 @@ #include "qemu/cutils.h" #include "sysemu/replay.h" #include "sysemu/runstate.h" -#include "hw/ide/internal.h" +#include "ide-internal.h" #include "trace.h" /* These values were based on a Seagate ST3500418AS but have been modified diff --git a/hw/ide/ide-bus.c b/hw/ide/ide-bus.c index 57fe67b29c..37d003dd9a 100644 --- a/hw/ide/ide-bus.c +++ b/hw/ide/ide-bus.c @@ -21,10 +21,10 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" -#include "hw/ide/internal.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "sysemu/runstate.h" +#include "ide-internal.h" static char *idebus_get_fw_dev_path(DeviceState *dev); static void idebus_unrealize(BusState *qdev); diff --git a/hw/ide/ide-dev.c b/hw/ide/ide-dev.c index c8e2033469..799bd4b6ec 100644 --- a/hw/ide/ide-dev.c +++ b/hw/ide/ide-dev.c @@ -23,11 +23,11 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "hw/ide/ide-dev.h" -#include "hw/ide/internal.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "qapi/visitor.h" +#include "ide-internal.h" static Property ide_props[] = { DEFINE_PROP_UINT32("unit", IDEDevice, unit, -1), diff --git a/hw/ide/ioport.c b/hw/ide/ioport.c index 0b283ac783..a2f457f0bd 100644 --- a/hw/ide/ioport.c +++ b/hw/ide/ioport.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/isa/isa.h" -#include "hw/ide/internal.h" +#include "ide-internal.h" #include "trace.h" int ide_init_ioport(IDEBus *bus, ISADevice *dev, int iobase, int iobase2) diff --git a/hw/ide/isa.c b/hw/ide/isa.c index cc865c83dc..934c45887c 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -32,8 +32,8 @@ #include "sysemu/dma.h" #include "hw/ide/isa.h" -#include "hw/ide/internal.h" #include "qom/object.h" +#include "ide-internal.h" /***********************************************************/ /* ISA IDE definitions */ diff --git a/hw/ide/macio.c b/hw/ide/macio.c index 0d2c6ba910..aca90d04f0 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -33,7 +33,7 @@ #include "sysemu/block-backend.h" #include "sysemu/dma.h" -#include "hw/ide/internal.h" +#include "ide-internal.h" /* debug MACIO */ // #define DEBUG_MACIO diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c index a7f415f0fc..3bb152b5d3 100644 --- a/hw/ide/microdrive.c +++ b/hw/ide/microdrive.c @@ -31,8 +31,8 @@ #include "sysemu/dma.h" #include "hw/irq.h" -#include "hw/ide/internal.h" #include "qom/object.h" +#include "ide-internal.h" #define TYPE_MICRODRIVE "microdrive" OBJECT_DECLARE_SIMPLE_TYPE(MicroDriveState, MICRODRIVE) diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c index e8f41c0610..8736281305 100644 --- a/hw/ide/mmio.c +++ b/hw/ide/mmio.c @@ -30,8 +30,8 @@ #include "sysemu/dma.h" #include "hw/ide/mmio.h" -#include "hw/ide/internal.h" #include "hw/qdev-properties.h" +#include "ide-internal.h" /***********************************************************/ /* MMIO based ide port diff --git a/hw/ide/pci.c b/hw/ide/pci.c index 73efeec7f4..4675d079a1 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -30,8 +30,8 @@ #include "sysemu/dma.h" #include "qemu/error-report.h" #include "qemu/module.h" -#include "hw/ide/internal.h" #include "hw/ide/pci.h" +#include "ide-internal.h" #include "trace.h" #define BMDMA_PAGE_SIZE 4096 diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 1773a068c3..80efc633d3 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -30,9 +30,9 @@ #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 "ide-internal.h" #include "trace.h" static uint64_t bmdma_read(void *opaque, hwaddr addr, unsigned size) diff --git a/hw/ide/sii3112.c b/hw/ide/sii3112.c index 321b9e46a1..af17384ff2 100644 --- a/hw/ide/sii3112.c +++ b/hw/ide/sii3112.c @@ -13,11 +13,11 @@ */ #include "qemu/osdep.h" -#include "hw/ide/internal.h" #include "hw/ide/pci.h" #include "qemu/module.h" #include "trace.h" #include "qom/object.h" +#include "ide-internal.h" #define TYPE_SII3112_PCI "sii3112" OBJECT_DECLARE_SIMPLE_TYPE(SiI3112PCIState, SII3112_PCI) diff --git a/hw/ide/via.c b/hw/ide/via.c index cf151e70ec..a32f56b0e7 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -25,7 +25,6 @@ */ #include "qemu/osdep.h" -#include "hw/ide/internal.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "qemu/module.h" @@ -34,6 +33,7 @@ #include "hw/isa/vt82c686.h" #include "hw/ide/pci.h" #include "hw/irq.h" +#include "ide-internal.h" #include "trace.h" static uint64_t bmdma_read(void *opaque, hwaddr addr,