From patchwork Sun Feb 25 17:16:35 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: 775738 Delivered-To: patch@linaro.org Received: by 2002:adf:a356:0:b0:33b:4db1:f5b3 with SMTP id d22csp1233573wrb; Sun, 25 Feb 2024 09:18:19 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXxaPvcjsCi2vwmPj7XjdG4oknPhWKSbwV4pBRuNM3ZboyAjq1fRCpkW+RQ6EzJn/DyMv6Q5mHpWyGmx1mJ4w7W X-Google-Smtp-Source: AGHT+IExrNoZaK3+ugxSD48YRQ+YrmrWUJGM0AojwrOLUBQ1Pn+93nkbzJd7+vfi2tCxkTCdMZnP X-Received: by 2002:a05:622a:113:b0:42d:feeb:64df with SMTP id u19-20020a05622a011300b0042dfeeb64dfmr5810961qtw.36.1708881498987; Sun, 25 Feb 2024 09:18:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708881498; cv=none; d=google.com; s=arc-20160816; b=Dz59I9o9AlcYgKXi2ojCTVOkUJB3NDRtXCBtsNxaofrORTprx4sADIxJ1WBYDubVO2 0+KSjP9eVV3jTD5HgX5uc8NYpVB0qjPlpr7wmU2pm5ZvyIcIUyP0zw+kZySSmc+dWZdj 2VhaNPRbMDfMk3oyFyvStA9VKPqe/b8QfsoM/q8M0ReRvSz1UGk3fdFZCifb26Eq5VWS mqpIVOELYK8gLqjnnYW9yuTDBgZgmxiE1B8z9i67sjE0ZE5xbqJKey1KPE3UthP/g+KL GlezoprZ7Z2dHLi/hHKPW7EZtE2lqzaQyEzUaoS7LKmNGcX81/ZfpSJn3cqrC8rvPcVD TRRA== 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=cwzDlmu7+joT64q6lgoDz20T+b1NRYPG1wt4e7xF0MU=; fh=VVEokp7CVhK9laH95bwn/1/1P1PK3npn9obwhWd5NXA=; b=jK6Ne3Jevr6mgKGAf3v4S3Yc1Z/1olnCstti3eOsgbSWXcyJbpGfWvnV4c+ZMuhSs0 G5heB8tc2gK/WFyOpA4A+x1ymWjatwEYHo1GvhumaybHZGx7Vh4o1jhqAXmLRy9YkdIR Mv47K+UvN3fiQnZIkFGex0a8ZtApxDm6IA784+3VDslcJurocozs/p3hFGzakPteO7aU byeTuA/bB0tjyccbHvg57azVipeQX6zIu6+kecvp6g24npMvrlSV2zGxn9m4QGQ/9LNc b6RyOz1AuEUDVHRFBFLAVAPZfIAaufOYh4iIR7RJ7QlP3tXgWlgxyKNtIkl+EjEoY6c+ mVwA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RA5Ff0ns; 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 q16-20020ac84510000000b0042e5c1b4f78si3332184qtn.762.2024.02.25.09.18.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 25 Feb 2024 09:18:18 -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=RA5Ff0ns; 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 1reI7Q-0001tl-1s; Sun, 25 Feb 2024 12:16:52 -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 1reI7O-0001sa-Qa for qemu-devel@nongnu.org; Sun, 25 Feb 2024 12:16:50 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1reI7M-0003wV-LX for qemu-devel@nongnu.org; Sun, 25 Feb 2024 12:16:50 -0500 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-412a4a932f4so1526245e9.0 for ; Sun, 25 Feb 2024 09:16:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708881407; x=1709486207; 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=cwzDlmu7+joT64q6lgoDz20T+b1NRYPG1wt4e7xF0MU=; b=RA5Ff0nswQF68hFCVjnzAqGpfIcCUpWYAfxEh7MIafWZl7bfLl14dGPni7Oe3frnYx YBHBN+ptiGyLNnOiUPuO6oHpZFSKo/FGB6Kf+7PEJsKC5SqVrYcGnwdgShX+5d0spDn1 NojeOS8r5KCc6tqaQXwwvnIQGO7QTrkZwh/4ansm6vhTRW8HEiyQfIT/4v2y/FK6MyzA fc4fgkr+3IxUeymk5IEbEFkTpNlIazkK1qipzSZvCmy4b/81UKveri1HnI5zVxUI+5MC NO/d14eZZVn9gsmO4kv9cW5kRBRWHOi8h1n8qoeUnb3PmtJAo8K7x/zizenlZgGEXnpU rgKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708881407; x=1709486207; 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=cwzDlmu7+joT64q6lgoDz20T+b1NRYPG1wt4e7xF0MU=; b=w4K6N//WFeK+KzbtTsZwN5LQuzo5e8CaGIi3H/H1ESQ3Yqu9lB3lDRzsyhTfuuH51f Q6YFlGXiTYNMNVFBNWLMCUfZMn5tp8QzrPEb+NPTr3SKYmze9c3KOKIlQEeRzFCjXZUW mNlObKpkCqQ4NSeZ8KuxxI8r/NS9+p9htlSUPXQo4Bb7C4/qq+axvMaWMhZMTLVUlRnh WkimqBa5c/jPrurjkr/BKs3ifDUchB93QWViS63dzgbPCccmA6hUGG/B5a7/X6B3gCUk D8Yi3YGTC0rtjlwqZL7fqJYOdw+4ScGKqQO+w4tCjY39wxzMuaoCwDkyVTMqYINu+V17 qudw== X-Gm-Message-State: AOJu0Yy28iQ5WZ6qfHPnhjgT6s+Hol2a1pVbM/37Nw1gcvfdfg5AqFPR bXFlXf3QULhZwBDqVd+D9GqEVFPC3mJ+Pql3zx2dZIFsRYdPb0yTbZw9n6v99cJsB0L8toaLd36 o X-Received: by 2002:a05:600c:41c2:b0:412:9018:74ca with SMTP id t2-20020a05600c41c200b00412901874camr3943606wmh.35.1708881406794; Sun, 25 Feb 2024 09:16:46 -0800 (PST) Received: from m1x-phil.lan ([176.176.164.69]) by smtp.gmail.com with ESMTPSA id l6-20020a1c7906000000b0040fddaf9ff4sm9297419wme.40.2024.02.25.09.16.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 25 Feb 2024 09:16:46 -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?= Subject: [PATCH v2 1/3] hw/arm/sbsa-ref: Do not open-code ahci_ide_create_devs() Date: Sun, 25 Feb 2024 18:16:35 +0100 Message-ID: <20240225171637.4709-2-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::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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 | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 5d3a574664..995c7be23e 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" @@ -572,7 +571,6 @@ static void create_ahci(const SBSAMachineState *sms) 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); @@ -583,12 +581,7 @@ static void create_ahci(const SBSAMachineState *sms) 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(ahci, hd); } static void create_xhci(const SBSAMachineState *sms) 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: 775739 Delivered-To: patch@linaro.org Received: by 2002:adf:a356:0:b0:33b:4db1:f5b3 with SMTP id d22csp1233579wrb; Sun, 25 Feb 2024 09:18:20 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXKtDwt/R5hYPeug6xhDFYPbqRiKSAtt2e05/5uX4vaiUItZLwlFXLnyqCvaaG2JHsvYbAzH9GIaIfLwBgfRfmw X-Google-Smtp-Source: AGHT+IFjNlecwyShimyRVbO9D7/+0dFxUMvQQ2EBAJLL2qfuQTJCH5AMhd559MlmeELi6fNQ9QJm X-Received: by 2002:a0c:f38c:0:b0:68f:477e:5e64 with SMTP id i12-20020a0cf38c000000b0068f477e5e64mr5655300qvk.45.1708881499881; Sun, 25 Feb 2024 09:18:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708881499; cv=none; d=google.com; s=arc-20160816; b=yL6RLOuzvZVCQT6W7lAMwcgLOGkcKl4bIXmS/UJTGm7YTZo1/q07yvKiRQPePHiouX KCa8DY1udLhcEsM+F9k8BWlvo2R8wWNk7ndTsmiuYGpgNp28eKb8Qyt3loR1FgSPMlvj WXTqOYxnHY2gMFcLaGx4Xzd77sFp28e4h303Mnlht8+wRlR3oAucRxcZhyAAxB5XUq2Q dVrrWhbYW9OCNQZXT91ZRG/WNr/CoI7FgGx5u8Hi6553kistQwEujpr01mDstdEg5k/P KzCLbOJLzOquRDK5dyQJjUC9iXVnj9ZJt13R9U/E6HUZHMQkH6Siu1nzAZg6QF5EHf9C vlmA== 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=IB72GIQk4y7cG3O6ov/QP+e0zW2l/wpZpAki6K0Zz7Q=; fh=FPDFwUVZuuOOoGhfk/hhuyP0luiP2lp1wpPDoar7mHA=; b=hEGepZjiOsVDSmq0U7l84FuTA5cbmZ+WkbYU19DAKYC9WSJFO5Ze3c8sHU1d1Jf6Hk 0hDY3Kuf1tXS3tgb3JK0k2jSxLf2ZAR7YxN+bYvp+frHkJP6ietj71dfCWYzgXaaUTeI ZfNC2wQJnTGIXdecKrtYR+wXagKTBXGfF9hlm7hKvmiztMoeiTdNLXWDUK7gH3/2WdqL ccoLHRFBCuHyAMido6LrmUJa1LkdxmACBv2ygmMHa5TClRXjyxNzTDWTXr/+1CC3QZ0o RV+YM3wgdpqwDPU6uNxhS5SD6UHCp0C9l35UtRr1zhiNaFABcKDe11Q/nzhbunHFW7kg CK5A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WSbB93Se; 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 gw10-20020a0562140f0a00b0068f9636fa43si3347213qvb.443.2024.02.25.09.18.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 25 Feb 2024 09:18:19 -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=WSbB93Se; 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 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-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+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 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" From patchwork Sun Feb 25 17:16:37 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: 775737 Delivered-To: patch@linaro.org Received: by 2002:adf:a356:0:b0:33b:4db1:f5b3 with SMTP id d22csp1233451wrb; Sun, 25 Feb 2024 09:18:00 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXcGzrzYzqrbBucGSJS5L38vW99vulLXxbCjdhl4icZerJ354eh9d1CXqg+znISY8tKOE5hRbAGc3DP8rfkXqlm X-Google-Smtp-Source: AGHT+IEVIKuWSxaJOOm/eDR4Tw+BSCusaYZQs95O5zX/DKyd1/YQCFap9EYkAD7NR5G8XWSsRhvB X-Received: by 2002:a0c:e38e:0:b0:68f:501c:ea3e with SMTP id a14-20020a0ce38e000000b0068f501cea3emr6585910qvl.28.1708881480119; Sun, 25 Feb 2024 09:18:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708881480; cv=none; d=google.com; s=arc-20160816; b=jFh4BJr3GkGWxyVeDNfhgbbdhfmcKjRvjEyPSu9+NMxyYy7TlUZZQPP4jXjd0Q+Lsl CwwsTJ7U4/yJGfgVNZizIcFuve1viDuaqICpqLItrFBnTEsYxfnshd2bV8ezjwYzN//i lQPRjsFtHEXptfE6VbwfEtF3RBYXsVh6r+3LuKnFZPxyABVmVov1pYLcKn/j0liZOv7V uBogF/cbWDReZS83Klg4qtIP/d2lWtaITH+6csImo20mjPfdv+1T8cy6gPKvo3tcUXzP qWpO1ngOVNw991T5zMLLwALP5VegcdUXvclHXwvVxHX5KIwDp3+jPbhS4gXU3E3Y3/xp KifA== 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=gkPCXbejDmS0Tz82absP8HIve4fjz8E5Jb0BUq+vylY=; fh=VVEokp7CVhK9laH95bwn/1/1P1PK3npn9obwhWd5NXA=; b=bMHnJ9r0yTu1VemWwxjnOMdbtpJq/hkp6v1yAKvvEaSfy1t2TM6x43SXFpmY7UGoMb qJdH0I7Tk/3SqtBqSHg5UYxugrx0mvhjLroa0p2/Etx9ACydUDPXZ8aToYbvNf34fbLC O/N7onGwY4BlkSaSirvtQEgMqNaBfonIuAsy/GHx8FGOIJPUJ/WGpp3KhtU8jo0K6RWA aG6FUtX1k5kw6g3J+XKvlj+7l/HYANaGfGQW5XoR3kjGpZew7G9nAV+y/KiA2T+UKriC viQ8QbyIEVJA3RilakebGpCwxCViTdjrdBJCRFIP5zUvvKi9NIjcMwVra3/9A8Tr5aCa cgGA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PxswJHTX; 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 jl14-20020ad45e8e000000b0068f632a4411si3427700qvb.457.2024.02.25.09.17.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 25 Feb 2024 09:18:00 -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=PxswJHTX; 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 1reI7f-00020o-Le; Sun, 25 Feb 2024 12:17:07 -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 1reI7e-0001zj-5S for qemu-devel@nongnu.org; Sun, 25 Feb 2024 12:17:06 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1reI7a-0003zS-KO for qemu-devel@nongnu.org; Sun, 25 Feb 2024 12:17:05 -0500 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-41241f64c6bso18724005e9.0 for ; Sun, 25 Feb 2024 09:17:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708881419; x=1709486219; 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=gkPCXbejDmS0Tz82absP8HIve4fjz8E5Jb0BUq+vylY=; b=PxswJHTXbL8Zp4poXKP1k7pGyEfkCalxYsgnmSVhkzdvLSczj/EWHmPbkwcbZBW9sz XBPq10p7vK8bQo8hoSWtLHEvzWLMgBxbRFXc15/F9yTydH02FiSKvyNIIGBz6VDB1NVK VLkrhH1roR60elhwcZsV41pVYrkRutT+4JnaGHlL8baHJEI94S0oelxhK5IGwDXZA5D0 AUzx+wlap4iTVMg1ECUn43kuI8no/73aoXQDXzMS/VKyGEHu6YSlUFN7z77UvzU9OD2L s2ZV2RXvniJBtr3NftZW58Lu5JhBWj9XUG8EPoaPEaUNbipGNzMdOkFgLMQVmFNXeADs EDSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708881419; x=1709486219; 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=gkPCXbejDmS0Tz82absP8HIve4fjz8E5Jb0BUq+vylY=; b=CRK2LrpDfukRkvwFV+DmxbMOgAyhiD1HT6ltQeDePjkpFRljRreIEMgWMCBZf6vaaA J/5yG+PGttlA4ICQxLeRipW3j8Ami+wqdfEZzyDdJXo3wrkkLmuvOepV/JW99HlDCE4G ZD8fIxZTTGCduqpodhOb6/OwfM9ERCEOhI5lyR/KU8KGSgvoQuM9z9AMi5iwvSHdGZXN HSjbPtNRXSeAVx9g1d9PTLyzr0UN6oXv6lyJbEEz3sXpRlaDySmfhYunTXMzm2upTHCO jVktBNYvoH0XOH0BfOpHY9oSPj3gNuVQZAtSIAe6rS2uqVdhdSchCF9OUjOWfq5IGN92 eVRA== X-Gm-Message-State: AOJu0YwJFUrFWAR0iUPp3IxLky0M6mBRDQiD5mVZ0kTc206sEhwKv/e3 0hz+6Z8g5PsSaRqjKnF98onET/bs4qX9ZX3VtUldRNkwnQXZ0x4JUZ2bRG0x0wAeTEsGABXfGWK a X-Received: by 2002:a5d:4802:0:b0:33d:c2cb:c18d with SMTP id l2-20020a5d4802000000b0033dc2cbc18dmr2468095wrq.32.1708881419242; Sun, 25 Feb 2024 09:16:59 -0800 (PST) Received: from m1x-phil.lan ([176.176.164.69]) by smtp.gmail.com with ESMTPSA id e3-20020a5d4e83000000b0033d12895cfdsm5591435wru.61.2024.02.25.09.16.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 25 Feb 2024 09:16:58 -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?= Subject: [PATCH v2 3/3] hw/ide: Include 'ide_internal.h' from current path Date: Sun, 25 Feb 2024 18:16:37 +0100 Message-ID: <20240225171637.4709-4-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::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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. Mechanical patch doing: $ sed -i -e 's#hw/ide/internal.h#ide_internal.h#' \ $(git grep -l hw/ide/internal) $ git mv hw/ide/internal.h hw/ide/ide_internal.h 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..34f3d50ca9 100644 --- a/hw/ide/ahci_internal.h +++ b/hw/ide/ahci_internal.h @@ -25,7 +25,7 @@ #define HW_IDE_AHCI_INTERNAL_H #include "hw/ide/ahci.h" -#include "hw/ide/internal.h" +#include "ide_internal.h" #include "hw/pci/pci_device.h" #define AHCI_MEM_BAR_SIZE 0x1000 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..c2af344ac5 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -34,7 +34,7 @@ #include "qemu/module.h" #include "sysemu/block-backend.h" #include "sysemu/dma.h" -#include "hw/ide/internal.h" +#include "ide_internal.h" #include "hw/ide/pci.h" #include "hw/ide/ahci-pci.h" #include "hw/ide/ahci-sysbus.h" diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index dcc39df9a4..8ac99f64d2 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -24,7 +24,7 @@ */ #include "qemu/osdep.h" -#include "hw/ide/internal.h" +#include "ide_internal.h" #include "hw/scsi/scsi.h" #include "sysemu/block-backend.h" #include "scsi/constants.h" diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 23d213ff01..be72f4d3ed 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..8f2004f93b 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..32e9f62137 100644 --- a/hw/ide/ide-bus.c +++ b/hw/ide/ide-bus.c @@ -21,7 +21,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" -#include "hw/ide/internal.h" +#include "ide_internal.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "sysemu/runstate.h" diff --git a/hw/ide/ide-dev.c b/hw/ide/ide-dev.c index c8e2033469..832293ca69 100644 --- a/hw/ide/ide-dev.c +++ b/hw/ide/ide-dev.c @@ -23,7 +23,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "hw/ide/ide-dev.h" -#include "hw/ide/internal.h" +#include "ide_internal.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "sysemu/sysemu.h" diff --git a/hw/ide/ioport.c b/hw/ide/ioport.c index 0b283ac783..7a80c549ec 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..2fc28d64b6 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -32,7 +32,7 @@ #include "sysemu/dma.h" #include "hw/ide/isa.h" -#include "hw/ide/internal.h" +#include "ide_internal.h" #include "qom/object.h" /***********************************************************/ diff --git a/hw/ide/macio.c b/hw/ide/macio.c index 0d2c6ba910..7611a99ef5 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..09781658f9 100644 --- a/hw/ide/microdrive.c +++ b/hw/ide/microdrive.c @@ -31,7 +31,7 @@ #include "sysemu/dma.h" #include "hw/irq.h" -#include "hw/ide/internal.h" +#include "ide_internal.h" #include "qom/object.h" #define TYPE_MICRODRIVE "microdrive" diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c index e8f41c0610..1ba2541b40 100644 --- a/hw/ide/mmio.c +++ b/hw/ide/mmio.c @@ -30,7 +30,7 @@ #include "sysemu/dma.h" #include "hw/ide/mmio.h" -#include "hw/ide/internal.h" +#include "ide_internal.h" #include "hw/qdev-properties.h" /***********************************************************/ diff --git a/hw/ide/pci.c b/hw/ide/pci.c index 73efeec7f4..855cbb031d 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -30,7 +30,7 @@ #include "sysemu/dma.h" #include "qemu/error-report.h" #include "qemu/module.h" -#include "hw/ide/internal.h" +#include "ide_internal.h" #include "hw/ide/pci.h" #include "trace.h" diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 1773a068c3..886cf840f1 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -30,7 +30,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/pci/pci.h" -#include "hw/ide/internal.h" +#include "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 321b9e46a1..e28bbd160d 100644 --- a/hw/ide/sii3112.c +++ b/hw/ide/sii3112.c @@ -13,7 +13,7 @@ */ #include "qemu/osdep.h" -#include "hw/ide/internal.h" +#include "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 cf151e70ec..ceecb3aa01 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -25,7 +25,7 @@ */ #include "qemu/osdep.h" -#include "hw/ide/internal.h" +#include "ide_internal.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "qemu/module.h"