From nobody Sun Nov 16 01:07:13 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1762272619; cv=none; d=zohomail.com; s=zohoarc; b=TI/e3eQc7BPcesNN4HIt+UaXSJcM9v71ZaPCKS4lMaZzRnnBF2i0IvizdrIDoyB5ZuHInKme2+z7g9qZ3ZX5VCcDIyx4zFozgPmwUs0nyQ1QsIpItFBkzGwUdyYCa5mLpQCO7xgTUFtEPLWDDvQKnK7zjQHmJNiDxczOCo8rCy0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762272619; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=/MHZb1LdZqvo7UEAQF8ntiHG2BeGF10fj7LRcfuFkiE=; b=gj/HrfzQ4hcueeL4WkZ1yvl+7HKDnyu8JTznF1TCYYcxt3pyOk84aG+5CRnZO04pKAU63Opb3EyLcYvZ6+7xVFb82KZUja/4uwP/AxOYu3L2c6l7nkc0GIqM9PCXFbUF9Fii0szbR+VpAFP2xBLuXUv8EzxktBYy7ht5CpnUrow= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1762272619128725.0130366210582; Tue, 4 Nov 2025 08:10:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vGJbV-0006fX-6R; Tue, 04 Nov 2025 11:09:53 -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 1vGJbS-0006fA-8F for qemu-devel@nongnu.org; Tue, 04 Nov 2025 11:09:50 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vGJbQ-0007JM-Jm for qemu-devel@nongnu.org; Tue, 04 Nov 2025 11:09:50 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-47754e9cc7fso7107885e9.2 for ; Tue, 04 Nov 2025 08:09:48 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47754adcd08sm57314455e9.5.2025.11.04.08.09.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 08:09:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1762272587; x=1762877387; 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=/MHZb1LdZqvo7UEAQF8ntiHG2BeGF10fj7LRcfuFkiE=; b=WRJPt8sxwzF8c04JeAyDZhXbYx1YCDpbVBdUd90a9UnS3XLvHvADRi2LSqxZNUmtyn mXp4Vt74wsvt0PfBqAwHeD1eEMfw0iquB7wncP0vrusX717WMc0P1Ihk7RATeZf+FBV+ G4X1phxmC74A6bEd+zAV/Lz/WRvzdh+upy5hfKNGElt+vUvfOkJWzHaTQQDOkY9vtUqk YEomCPGtTrIL9WmovFuBXscyKDTpfuBOqJ+oK/amuJZOnq1lp0C/9JiKjLxzeHSvxURr qb09j57lOKbcgYgkYD3VqTRLPdXTrlf7Lpjf6/5YfczI0xKba7mTPqk52QHahN0X/YmV Pybw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762272587; x=1762877387; 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=/MHZb1LdZqvo7UEAQF8ntiHG2BeGF10fj7LRcfuFkiE=; b=FgO+RvmKinKWXHkucR4dhGLazIVWSu92i/kYh7jVF+6FU/MZcBt8DCBpH3hbEn2dGm cEieuikcjmLWobg6aAxmYTfTI1/lcPbziRkqngviohHnzj2JZKNBt7sBwGZX0cCGru9N NhP9yhm7dyKWBilqg41bo5SCiTjicCJLhJdPdgUZc+tp4IR4x2+o4NQ7J+KA5h0+2enu gx3tNEfpTiYn/EJeiCdbmCXCr5/27QJAqSdTAQBlfLUQgJoLkzN/lJyZX+J0bwpkne88 AIczC6njGFPwrwd8gOmHwgf/wm7jQV6qd8xo255/kGDwNvBcYNuIsA86rh5Q/e4n+6Op tcwA== X-Gm-Message-State: AOJu0YxKtVgZEHW/h4Auta5GoKIObeXlypRqNeboNwIcBe5idQf0ZY7F Fk4ZuJ6xpJ2CfWxhFTzjeWj9igDLtaPbQ4KWMj+spD9aJXvExja93AOciFeA2EhzxoM4VPE9y5O DKe8Z X-Gm-Gg: ASbGnctYa4wgBswane5jjokeTQ6N1wx62Xl4lMik6DNiWiSIu02fdbsh2nQd3UQ/Lpx 2PLNQZYE6lUOF0Y6TVexRZ/XTWR6L6VHuHp9MDw63hpCEfWZOu52EhOkcWIKIIDmxMf9dp+hGLI Ro9hB+3BsiCurLAZv2gkuM0P7PhydOWK7DC0DrravUXZ0f6ENOzgadJ0k2trO6URvnt9r/eSdkZ VyFxNSQr0kVwuBi1cN+jAgQ8lrOIOb4PqWFxBkVFUk86FE8AKvFscHSXM4eQ++yF0VF3cqsn4EO +ptAZzkOxLqc6ciX7/IJ5L+vXAGI17ZuqMKQEzwDiUoFtDpRfWsHeHs9dqccXFBBKjNRHhnyw/h QPc5XI7EpiE5DGKVeJr5OIa1Dfq07M7uikLOMl97ZhM7+8SNsLA9c4/BSGZ/U+kzGwXnSJeSTpx Y2rLLnMQ== X-Google-Smtp-Source: AGHT+IGGhjEvjTjcjLT+0HdVLqmAaAOOQfrnumH0jIu+eMHcue+mWjYhsX9tBEBw9E+tQw0iJMxzZQ== X-Received: by 2002:a05:600d:831c:b0:477:54cd:2029 with SMTP id 5b1f17b1804b1-47754cd2172mr22065555e9.4.1762272587031; Tue, 04 Nov 2025 08:09:47 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Jonathan Cameron , Fan Ni , John Levon , Thanos Makatos , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Alex Williamson Subject: [PATCH 1/9] scripts/clean-includes: Allow directories on command line Date: Tue, 4 Nov 2025 16:09:35 +0000 Message-ID: <20251104160943.751997-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251104160943.751997-1-peter.maydell@linaro.org> References: <20251104160943.751997-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32e.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 autolearn=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1762272626307158500 Content-Type: text/plain; charset="utf-8" Currently clean-includes supports two ways of specifying files to check: * --all to run on everything * specific files There's no way to say "check everything in target/arm". Add support for handling directory names, by always running the arguments through git ls-files. Signed-off-by: Peter Maydell --- scripts/clean-includes | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/clean-includes b/scripts/clean-includes index 25dbf16c021..07c0fd44e46 100755 --- a/scripts/clean-includes +++ b/scripts/clean-includes @@ -14,7 +14,7 @@ # the top-level directory. =20 # Usage: -# clean-includes [--git subjectprefix] [--check-dup-head] file ... +# clean-includes [--git subjectprefix] [--check-dup-head] file-or-dir ... # or # clean-includes [--git subjectprefix] [--check-dup-head] --all # @@ -28,7 +28,8 @@ # # Using --all will cause clean-includes to run on the whole source # tree (excluding certain directories which are known not to need -# handling). +# handling). This is equivalent to passing '.' as the directory to +# scan. =20 # This script requires Coccinelle to be installed. =20 @@ -86,11 +87,14 @@ if [ $# -eq 0 ]; then exit 1 fi =20 +# --all means "scan everything starting from the current directory" if [ "$1" =3D "--all" ]; then - # We assume there are no files in the tree with spaces in their name - set -- $(git ls-files '*.[ch]' | grep -E -v "$XDIRREGEX") + set -- '.' fi =20 +# We assume there are no files in the tree with spaces in their name +set -- $(git ls-files "$@" | grep '\.[ch]$' | grep -E -v "$XDIRREGEX") + # Annoyingly coccinelle won't read a scriptfile unless its # name ends '.cocci', so write it out to a tempfile with the # right kind of name. --=20 2.43.0 From nobody Sun Nov 16 01:07:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1762272663; cv=none; d=zohomail.com; s=zohoarc; b=PGrgJXwqWrHNKV2lF8COKhAwcitkCHqjdQlLHi3CxKpYafLM+Zk3ggk3CPEaKs+VuGzfW5GDWSkXPInA8TmKOYNIVn3aUsIRZMarcrBgQ194Xg+79fV5oa9kyskYYGg78sm2q81vHdHFc3KvYzXwSg+DN1ek8VaLLNvsnIRJxXM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762272663; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=09if3quT8vnKDUHuOjmOHKUfaA1XeBQDUDHKw2iQQ/M=; b=O1PGyaFJ/GSf3kf21A7L9isjVvXv7LuQUyILsmr1tqC0mRaBXz+cS2fwY9to1VAj2Qi/bs81pZiFgn/zUqQoA2fTOTul0ZyvYQJu0lBb+GjfqPYbO8fONEBkf1UnOlXW//dWULYqWMFGc7xZ7vUtQSb5xyuKEr1hx+E3cfw9VBs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1762272663436147.57711997606646; Tue, 4 Nov 2025 08:11:03 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vGJba-0006gM-AX; Tue, 04 Nov 2025 11:09:58 -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 1vGJbT-0006fP-Cl for qemu-devel@nongnu.org; Tue, 04 Nov 2025 11:09:51 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vGJbR-0007Jb-Qu for qemu-devel@nongnu.org; Tue, 04 Nov 2025 11:09:51 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-47118259fd8so42786875e9.3 for ; Tue, 04 Nov 2025 08:09:49 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47754adcd08sm57314455e9.5.2025.11.04.08.09.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 08:09:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1762272588; x=1762877388; 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=09if3quT8vnKDUHuOjmOHKUfaA1XeBQDUDHKw2iQQ/M=; b=B/o2x6Dmy+AJcDbBDabYOlAJXQT4O6Ryfuyo535WP54b+ci50m2gpcXusQgSL0jJx+ aaDtprGSpf9hR2NsBPCZYfkuqLp5Yf9c0K1FbEhm1nDEHVLTSdiZrGNuZ5UukFo0RXPi Q8HVtDMdgPlzCVzEAGPmA6nplRtwzAKEryozNVoUrAavfSqxWmTpaAwLiYxT6+YPB1UV /2jBCQ7U3Iute1FKQZCHreTUwg3RmXNJqLRR9srET0L6rDkVnx+R0RR8nhB0tyBZWDQP 1R06uDuphC0b69Tamjr4mdArnSDpA9ChH0AjD/tX/R0K4Ca3VVzhFEBMFY8of0ozP+4J ajaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762272588; x=1762877388; 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=09if3quT8vnKDUHuOjmOHKUfaA1XeBQDUDHKw2iQQ/M=; b=s4tPlMpfmmn25o/wPi4LXL61GiIGGmyi5BQOaANRTH48XdXxwIUSX0ngyMQy8BNy2r 0k9Rj0vMbxH2o51ucwNufuKD+QQeU+OXZHqj2A+q5tMPjLhq0wrPcGdkSRqWC8Z2KM+x heORtzdL/D2gVGctm/6+b55QkUDaQXuGndWBpanRZ7n5pBw8EpbRH88xb7KpvnY7Ow1m oq9TGU27e8eCqu7Eo8aQOwv/YlJN0QMU5CPKSAF5acStDyOvQmt3KZnuA5dT3TNqreBu 4hSsOKbFRtFKi2E1Luxg9T0BG9o0BIBeF269q1bGIKWqTsWGH6tQvHkksRmfVysyMnHu mNQQ== X-Gm-Message-State: AOJu0YykSJYkQUmMtkkrKa4UbLTXTTXh98llf5biGnAmR61jS9T0c07w dIGDtFeJ/jUU7bomPgXEpO0KAOo6AbB75lOEMNQQ7sy0MUxX3KwrJIGI/zkD8CGQOqqL5nb1xsU bSWum X-Gm-Gg: ASbGnctkTBpAzru1gMd84cCaDj8e8Xx+qNm/gg1FBLf/L3UY+wWZ5FaU7Bqv0Q+1TpP mDKjYfwCVdXEEQPxuaBrkpTjPeyJKmaFBKyTjf/7wGMJoXPVl3CMeB+V/RBk+vQvxRrQFE/gWwo JH9p2YvC24Q4YRwweS3OpRCxYIIXblttBvGAepMg5mZ1e3N3Czxa8or5cBHxfv3f5OFTrcygSu1 sQn4P9PyCM6x+eH26Ez1XUjzHtIYqtV2DWQAoe4hPSheEL5YaK26XYSY0/E1ZznjV7DNwZ8aBOk taL2qzcfo5CF/wOrH3RvkPSInLgxC3uvE0Zbl9HIKuyWMriY8PfYS+XPTxGyu9fRWRncF0hmCYr ZXAUiQP5suLceAhmkXv+LV+qAaZf+QFdiiL/DayNgmPr+1XwR+kvNgwyQE2yJ+7m8e0MgmxvtJ1 J0qp+nDg== X-Google-Smtp-Source: AGHT+IFX0GrZA0QuN2x0bkKN4Rx22FC1wg7I1DyDOBg0/AbdhXmBriUU9eZ452O+rttpN5Hl36E72g== X-Received: by 2002:a05:600d:8346:b0:477:54cd:202f with SMTP id 5b1f17b1804b1-47754cd2267mr23515645e9.3.1762272588133; Tue, 04 Nov 2025 08:09:48 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Jonathan Cameron , Fan Ni , John Levon , Thanos Makatos , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Alex Williamson Subject: [PATCH 2/9] scripts/clean-includes: Remove outdated comment Date: Tue, 4 Nov 2025 16:09:36 +0000 Message-ID: <20251104160943.751997-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251104160943.751997-1-peter.maydell@linaro.org> References: <20251104160943.751997-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x331.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 autolearn=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1762272664053158500 Content-Type: text/plain; charset="utf-8" Remove an old comment suggesting a manual shell line to use to find files to run the script on. The script's exclude-list and its support for directory names make this irrelevant. Signed-off-by: Peter Maydell --- scripts/clean-includes | 9 --------- 1 file changed, 9 deletions(-) diff --git a/scripts/clean-includes b/scripts/clean-includes index 07c0fd44e46..568033ee9c1 100755 --- a/scripts/clean-includes +++ b/scripts/clean-includes @@ -39,15 +39,6 @@ # removed. # Other files (including C++ and ObjectiveC) can't be handled by this scri= pt. =20 -# The following one-liner may be handy for finding files to run this on. -# However some caution is required regarding files that might be part -# of the guest agent or standalone tests. - -# for i in $(git ls-tree --name-only HEAD) ; do test -f $i && \ -# grep -E '^# *include' $i | head -1 | grep 'osdep.h' ; test $? !=3D 0 &= & \ -# echo $i ; done - - GIT=3Dno DUPHEAD=3Dno =20 --=20 2.43.0 From nobody Sun Nov 16 01:07:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1762272640; cv=none; d=zohomail.com; s=zohoarc; b=K5dAZjxL7cD15gqjLnEvAnIXIJcYNTqcr5QakWz3+IgNtGbgpR3t/U4ozGYO5JCswyzlHhs0AGz4Jju45bierq8QTfr7/yLSuUX+/qyOICeIrCCsl7bE1iLeKifV5CNajO2KeTQ7nlGnyB2yF4XDgkp1oH5rfNLnOPDeXggbyWY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762272640; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=FjdCF4UgNd4SZkh6SP1qLa1Jn8mI7bzwm8Kk/HbIkE8=; b=X6qu2TwRSxMhlkIbSdi3Pr06Gm+7ITjsPHFFaY4xf4pbPS6Ys2NTkSLV9qCFZY88OmaFQ+4QiQc1dFTRPzd5uztjxWaekPZbwumLDTiW4UYTSxYdQ8YpMUUUYU33gW5J8s5OceQCe5Y3ycS63NAosM9cElTNL2o0LBASjPv6XU8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176227263997534.14681811819992; Tue, 4 Nov 2025 08:10:39 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vGJbd-0006gt-3m; Tue, 04 Nov 2025 11:10:01 -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 1vGJbV-0006fp-Jd for qemu-devel@nongnu.org; Tue, 04 Nov 2025 11:09:57 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vGJbT-0007Jp-DK for qemu-devel@nongnu.org; Tue, 04 Nov 2025 11:09:52 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4775a52e045so1477235e9.3 for ; Tue, 04 Nov 2025 08:09:50 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47754adcd08sm57314455e9.5.2025.11.04.08.09.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 08:09:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1762272589; x=1762877389; 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=FjdCF4UgNd4SZkh6SP1qLa1Jn8mI7bzwm8Kk/HbIkE8=; b=cFLiz4uWzzII04lqo4dEXgGk8Yp6CCtNQlwc7yWfneW4HG8CnAzwimNXSz8uf0KdB/ 2Zax+sfcEoTp7tcpPg4JBECwcmmCrIP9SsMUUuVPyws0iFoP44QrNKdVwJJ6tQKP0TjQ KPpyF95H4sBy81BlWQlxkdCrozyhiDpkGnm+k0eVlSYriPBHRjZZTt7kdylCyGSZRG8C eU4XRsgBSCPqsgOsTG6PhSK28WWaFWtBVuU9z6JxWQXg4W302T0f4pw+wppk2nMRBi59 BhoqMJ4x8+SGtmmmbDmJINKEkxBP/wwrnafyLSx++BPzVeZpSgRjrvjLBSMGHvDHbmDV 3EZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762272589; x=1762877389; 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=FjdCF4UgNd4SZkh6SP1qLa1Jn8mI7bzwm8Kk/HbIkE8=; b=mAXBJjIDZ9/MIfli0Avp/apNygy3hLk9SDtciTVxh8FVIM5uk8igvmuVJAGpRIlYWN I7rwLb/6cMGKC+lF0iyY+XrGHPzRNpFGr1MuPQyWGtTZ3FYpeW5VeJYq4WsAPhqM6C+U t+6XcU5I+mtBG4947p9ftdyymeK903aV3UU+eO622itkzA+X3u9dGv4IfbvXjPCh1HOY +Sf8ctBYnrl5kXzgFotwwA0K6WzPzuoaXrLLYvdL28/q27vjqHKk/FxStdhqduaG6UMw 7GEiczDxkSAds+HjTXd+pVsLgSeXA8Jv+LPY0G8+/tSXCdyTJNXVegz2/mBOoa6EiZnU GV6w== X-Gm-Message-State: AOJu0YysCb9NXi7OuhuJ/DFKnwm3AnTXCH06915WhqGrSXjBi2MsXD9k LyijXfyE1ekIJvcYJ53aELOEVvutpusjda4eEt/4bX49C5tNN0buLf82m8y/NMBpCYOwxdOlJWc 6wSRW X-Gm-Gg: ASbGncv9pqkgRUR2R9I4/mig046ExyGozWzggqTxAFSreBD/thcRmX34P1gvYYJz7vy rh3UhlwAks6PqxqmrikA7Cb6LnKhbD/ypMmpg16aBcLDgbRzIpOQo6XFlHpmgJxwl05KGTTKN7Q 0qnWI9iotGpExYNkiw9PTOLPcz3Rew4ZVjWmxC3I4ZHHhhuveszKiql163Qs78dy3uH4IMBaEol U1raxITYM85a+J/Iep94wJkp6G9ps93fnl4PrnDE5Xm8HOboHweW6OF9bHjZ/w5AmCW73Vj/08R 9Z+3n2fZsHoDxcM6KWwT69SK4PuP+y10OoPWFTYttIZUwUgVr/p+B0GlnTntiEiVkPzM/j8ZYcs Pjv8lXuBaUEfsDyHNNvUG5j3MaEA9TOKkQrNe4WPQOz2nb6PjVo392x5YJ958WczdjkEUpp6ytf NiwIZ7wA== X-Google-Smtp-Source: AGHT+IHJ62yJOviHbRJJN3pTb5mDsFv4TuJup00cA8TE/7rVS6cNhwgGnmHDoUxNyTLddE/r5704Ig== X-Received: by 2002:a05:600d:634c:b0:477:5c45:8117 with SMTP id 5b1f17b1804b1-4775c45824fmr2078785e9.41.1762272589263; Tue, 04 Nov 2025 08:09:49 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Jonathan Cameron , Fan Ni , John Levon , Thanos Makatos , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Alex Williamson Subject: [PATCH 3/9] scripts/clean-includes: Make ignore-regexes one per line Date: Tue, 4 Nov 2025 16:09:37 +0000 Message-ID: <20251104160943.751997-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251104160943.751997-1-peter.maydell@linaro.org> References: <20251104160943.751997-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x333.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 autolearn=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1762272642029154100 Content-Type: text/plain; charset="utf-8" Currently we have a single extended regular expression defining files that clean-includes should ignore. This is now very long and awkward to read and edit. Switch to having a list of newline-separated EREs that we write to a file for grep's -f option, so we can express them more legibly in the shell script. We allow for comments in the regex list, which lets us document why we have put the exclusions in. Signed-off-by: Peter Maydell --- scripts/clean-includes | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/scripts/clean-includes b/scripts/clean-includes index 568033ee9c1..5ab3b071967 100755 --- a/scripts/clean-includes +++ b/scripts/clean-includes @@ -42,8 +42,6 @@ GIT=3Dno DUPHEAD=3Dno =20 -# Extended regular expression defining files to ignore when using --all -XDIRREGEX=3D'^(tests/tcg|tests/multiboot|tests/fp|tests/plugin|tests/uefi-= test-tools|pc-bios|subprojects|contrib/plugins|tools/ebpf|ebpf/rss.bpf.skel= eton.h|linux-user/(mips64|x86_64)/(cpu_loop|signal).c)' =20 while true do @@ -83,15 +81,33 @@ if [ "$1" =3D "--all" ]; then set -- '.' fi =20 -# We assume there are no files in the tree with spaces in their name -set -- $(git ls-files "$@" | grep '\.[ch]$' | grep -E -v "$XDIRREGEX") - # Annoyingly coccinelle won't read a scriptfile unless its # name ends '.cocci', so write it out to a tempfile with the # right kind of name. COCCIFILE=3D"$(mktemp --suffix=3D.cocci)" +REGEXFILE=3D"$(mktemp --suffix=3D.regex)" =20 -trap 'rm -f -- "$COCCIFILE"' INT TERM HUP EXIT +trap 'rm -f -- "$COCCIFILE" "$REGEXFILE"' INT TERM HUP EXIT + +# List of extended regular expressions defining files to ignore +# Comments starting with '#' are permitted +grep -v '^#' >"$REGEXFILE" <"$COCCIFILE" < (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176227263960565.81609470321644; Tue, 4 Nov 2025 08:10:39 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vGJbb-0006gd-2I; Tue, 04 Nov 2025 11:10:00 -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 1vGJbV-0006fq-JH for qemu-devel@nongnu.org; Tue, 04 Nov 2025 11:09:55 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vGJbT-0007K4-Vm for qemu-devel@nongnu.org; Tue, 04 Nov 2025 11:09:53 -0500 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4711810948aso40756635e9.2 for ; Tue, 04 Nov 2025 08:09:51 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47754adcd08sm57314455e9.5.2025.11.04.08.09.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 08:09:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1762272590; x=1762877390; 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=a5F/yooW6pnu1OikcO4nD2DRUAh0kt3jpTBeUpOiYpU=; b=MMT/Q89QumS+f5WQ5BFCaDFRYjZZ7DhFlAWwehxr9Uhp3s1xgPxu7Xe/y5ztttuXI5 3A4ENITMMjIJ9QjWDrnxz+BpXjccoUtCaJ9I/NfD9rcn5/kf1tvdSDiZmIVFfoKd0xuz m1CJBNsOt6RYK7kUVJeEZzerqOwITs1SlBpxL6yxVOuHT+pouGjnufQW0CuOlsVwehY4 5zKoYlPXSeX0LpP7UlTy0FWJFaBSdlSujHYqM1bPNRWk2XIpfIFKfg9hI0uDWTc85Wc/ haZ6D/Ide8eW1knD4GbyGZTCyZDIIx46KH0aALRXz+LD9zC+KYMFx6JRkErEyg1L7VMB fwKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762272590; x=1762877390; 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=a5F/yooW6pnu1OikcO4nD2DRUAh0kt3jpTBeUpOiYpU=; b=sc9N2cEMxsH8Y3e9Gh9ODgoXnErE/+BimXXwu3FP7lTKP8xZBRg7FSXtUZWgNj+bS2 z14dcb36+WpgVhoM1wTapv/6dib5ZEwn0HzzpHxYqX5htnApO8YiirCecwOimZXaf/NJ 3VY0XYmj/yOXtBlGxDXF0Gow0FK3lpoJTKVZQdieUHyUbZEdtuYYj7NvC6N6pUTSSRmU 6DozVkj1PHeaEcMSHocP/8Gy0g72KMWRyxZYI6mU0Mc21kXuroJ6qezpvOghWjsAyum+ Qg9zW1Ai9UN6CpBNY/KB8EmObS3cyeik5zzpErcGuuMYxOxwpazJiQUO6lYFaWbD4xYg jj5w== X-Gm-Message-State: AOJu0YwhjkJp7ExCkr3/sm38yIG1FioyQCOaRDWmoBqeNuj5r/zlP+8z MfXCBtqG62AwFES+1TwCtBrKx55cSXKMc05PPpGv4W8FcYU0pnPKweH+IDEx9cOGs0AvgZocabn /Er58 X-Gm-Gg: ASbGnctGxIn4taQhQsMQuBSddZXECid3cMJ8k0QDhDy/dJp4v307/87M/ZmQaLbYbpR KgY8cbUNtf7E131rz4cBApb9SgGKIlym8afzKTGz/tKZDtVH3HSHaGT0wbxK+HXdIOmLBQhng+1 lTzB+ukptDwVq17TWxbZjV3WHIklUEZtbiKy5pQEnIusnD4gUtgRTRkUk9ypwz451Tyodb376lg Bd5duEKyjJ/Ir+A0aqGvIyfJXX8cFRvCVISe+dmLzDrxJk0e0vtkICmLhOURTB/3X2tiflrrWHf MzJxim3iNtJzsPEdmcsLaR08JTud6UG/IDlZy8E0ZzTljBBUTJyHlr9ZTCylKKuICFcEWR7lna3 xduCXVQgvinnSHo00IrNSC1rd8qXn+WZaZ26kGoFecn7zR73tH91URdw3QJv022n0G0vkVUZl/k t6chULJQ== X-Google-Smtp-Source: AGHT+IHia4kgfVTRl0WN2/dJ53EnZfa5whxOOhQqoOtPN+vqI8LI0Ja7TaGKV2Z+wIqOUymeW7e1fA== X-Received: by 2002:a05:600c:348d:b0:477:54f9:6ac2 with SMTP id 5b1f17b1804b1-47754f96ce4mr29353415e9.0.1762272590273; Tue, 04 Nov 2025 08:09:50 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Jonathan Cameron , Fan Ni , John Levon , Thanos Makatos , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Alex Williamson Subject: [PATCH 4/9] scripts/clean-includes: Do all our exclusions with REGEXFILE Date: Tue, 4 Nov 2025 16:09:38 +0000 Message-ID: <20251104160943.751997-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251104160943.751997-1-peter.maydell@linaro.org> References: <20251104160943.751997-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.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 autolearn=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1762272642165154100 Content-Type: text/plain; charset="utf-8" We currently have two mechanisms for excluding files: * the REGEXFILE which excludes by regex * special cases in the "loop over each file" which make us skip the file Roll all the "skip this" cases into REGEXFILE, so we use a single mechanism for identifying which files to exclude. Signed-off-by: Peter Maydell --- scripts/clean-includes | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/scripts/clean-includes b/scripts/clean-includes index 5ab3b071967..a45421d2ff7 100755 --- a/scripts/clean-includes +++ b/scripts/clean-includes @@ -104,6 +104,15 @@ grep -v '^#' >"$REGEXFILE" < (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1762272656082673.7946896452543; Tue, 4 Nov 2025 08:10:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vGJbm-0006k5-3S; Tue, 04 Nov 2025 11:10:11 -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 1vGJbb-0006gr-B4 for qemu-devel@nongnu.org; Tue, 04 Nov 2025 11:10:00 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vGJbU-0007KR-T8 for qemu-devel@nongnu.org; Tue, 04 Nov 2025 11:09:54 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-477563bcaacso6248865e9.1 for ; Tue, 04 Nov 2025 08:09:52 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47754adcd08sm57314455e9.5.2025.11.04.08.09.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 08:09:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1762272591; x=1762877391; 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=Nwbc35izo7jBkFp1Gk6qCqzfNIu+g3CB8xZ18Iq/760=; b=kNf7AtgRmbBkXF/7lw2/zIASn2xt5tfk6+s2aHErwmEwb/PZN9/mxVGWmInFSSR/zh PId5QyNGZSpD74rChE5xiUV3FDs6LMOjXbg8NyksmWTid3xYejrKitT1h+1nM1cUyUNj MAThusD60ICYbiou+dMGkYN8dQRskHMn2QzZvjOoddsbvopLY3CjphmCpmPkkumTaIxN 0FCYni6LhDc66vzWYXG+0PR3/7KrF3xCpDlsjLeoClJyIx5DqkVX0+5ItF6hDDyXsP0z k/14NbaWkY8JjbTsKsdn5wxuLYdUx1SF7OlFnjE4xDnkAWmO5DV+w5GkWxbOp8dWXLI2 yfow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762272591; x=1762877391; 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=Nwbc35izo7jBkFp1Gk6qCqzfNIu+g3CB8xZ18Iq/760=; b=q00RvWcFkGLTxjLl9X71Y/MNKsCbCWlUqLvXHxVjNBpgy4dYlvCuX+wBXVSa117D/z jQ1iUr7jDMPBTMEOgpiyCSqg2Dx2kHTGnBsjCahkG/I9VvdVRA6VcDPDx4m/EjgMHmK3 2QLP7JnBJctJW+nCOjspEG82oXJfU5owlBIgisKJPyb8tBoJCS/I78SAvDYi0oT/2pIw C34TjfKaq3zVByLCHSN/9TKjz9fpbLE6pVbtB22lLlwuEbvvfsWE2VyA71tQmLJ4UsrQ WPKrkO30QIN2IlcoJyOq/0UC7+QrGDPEdfcaSa+IIdpmloV/jF8aM1OZDlqBPOJw7Q3p OIDw== X-Gm-Message-State: AOJu0YztREuVnh/7E3cfhn68jdITwKxNz1aMJZp25oLZUOuoZ0N4jJOG Mky+h7F2pBn+MrKAegefMULa0bT7lkJOV8VB5GlSDGA1btGSwhDJWnrq6bitWk9auQdeUxaWTST aFLRn X-Gm-Gg: ASbGncvCy9nuCLoT2KFFq5VNAtvvDCYVYGWjNM+kVV/qC1pM8Vao3hLY6f+ZjzyFMHk KPHWY6+XtH5I5XmdG6fYrXg9UI+9OVNYPTG06UVk5CZJQXlhfJ6KPsMsZaymSnnNa7LqGz8ZeVv 6l9EAz23ZMPfwmIxat8cGcXK5JEev/fqeQKGTvrMUI86ChZm+bA1nSZKqnniIm3om2Okm5Dz+4O /R0qmWNBoCVIosnLY9Nkdhnq5lbiGe/6adyU7PEDIrL6Y4DFBSZtsfolL1OX/Xpt2ezj79vWaWy KcfVtFqlX4kU99QKgLHhQi2YVhHky/nFhXllUEstFe4FEzMHgI+nf7+QXPEFtVHGcY6FE0TZ+EG Ii9k4avMmr5OBUMzUEPWuz2I9gfLAUaD9oDxVUJVLMNVl+dUmUZiL0bXFDa+kn96BkB9g7CPPco ZuMKshv4q7MOYtr3oT X-Google-Smtp-Source: AGHT+IEFoT73Z3EIBGH0Sfi3uO6PpjE2JgbZAbOE4R78rj0Ul2MVk3CeMsOPlJLqkVS3reMJzp4E5Q== X-Received: by 2002:a05:600c:450e:b0:475:e007:bae0 with SMTP id 5b1f17b1804b1-477307e47admr154977385e9.16.1762272591321; Tue, 04 Nov 2025 08:09:51 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Jonathan Cameron , Fan Ni , John Levon , Thanos Makatos , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Alex Williamson Subject: [PATCH 5/9] scripts/clean-includes: Give the args in git commit messages Date: Tue, 4 Nov 2025 16:09:39 +0000 Message-ID: <20251104160943.751997-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251104160943.751997-1-peter.maydell@linaro.org> References: <20251104160943.751997-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.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 autolearn=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1762272658349154100 Content-Type: text/plain; charset="utf-8" If clean-includes is creating a git commit for its changes, currently it says only "created with scripts/clean-includes". Add the command line arguments the user passed us, as useful extra information. Signed-off-by: Peter Maydell --- scripts/clean-includes | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/clean-includes b/scripts/clean-includes index a45421d2ff7..694e12f062c 100755 --- a/scripts/clean-includes +++ b/scripts/clean-includes @@ -42,6 +42,9 @@ GIT=3Dno DUPHEAD=3Dno =20 +# Save the original arguments in case we want to put them in +# a git commit message +ORIGARGS=3D"$*" =20 while true do @@ -198,7 +201,8 @@ if [ "$GIT" =3D "yes" ]; then git commit --signoff -F - < (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1762272696222641.3826100909591; Tue, 4 Nov 2025 08:11:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vGJbp-0006nc-7n; Tue, 04 Nov 2025 11:10:13 -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 1vGJbb-0006gs-Bo for qemu-devel@nongnu.org; Tue, 04 Nov 2025 11:10:00 -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 1vGJbV-0007Kb-Ub for qemu-devel@nongnu.org; Tue, 04 Nov 2025 11:09:55 -0500 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-477442b1de0so19493335e9.1 for ; Tue, 04 Nov 2025 08:09:53 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47754adcd08sm57314455e9.5.2025.11.04.08.09.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 08:09:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1762272592; x=1762877392; 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=hQ8xqxIo4Z4GSnuU1F/D5K+ZGMDOJ+2wlLbVuuSt0QQ=; b=lJs/atpzrsvl4WFrt6Rmfvy/TVEFivsZCNOw9RC/FzfjK3GwFwSZHH6RRr/usNHidg Qd45skgBEWLPtCYheKybhQlUJ+bICXBwM3DfQBkFlgb7L7P/S1CSO+SpAlhj8/rZ+62e JQcyenhMY129jfSxV6h3v/vCkrwYrmKyaFA/ivlZ4kCSxHkzBtDASHR6+EU28B0SHlsu 7zhvu+yVUfPQNoRZcXp11SlRkjx5hk51InNLxwPpINJOX0NG6zn0HjW++kjZMXf+wV8+ POAwMn0j0S1qw4pUT/hMzEwt1AewoFnRYh9wBlv55bOYjlg2M2852K1KmURITsqOsvZ0 nomg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762272592; x=1762877392; 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=hQ8xqxIo4Z4GSnuU1F/D5K+ZGMDOJ+2wlLbVuuSt0QQ=; b=PMQCNlE/quydktlXOkkn5N4tuUACBbtAL+rFOpiDXLqWoxX8wwtngR79+VMidUuKWg n55/k1Gs3ZjbKwGGlIUei3SLVdNYSPw3G7qRAwgxlnRrqVhjIJNViMRKQ+natSnQYnc6 DTy4pL0ep0IXMDqqWUmTTL5ZwsPomaz352UD8hU53YuGfmav1FToSzA81R/F5DnBouwb Nsf2AIcVvriMjv5GHcQVpOQN24Quh/ig8FbBzw9YK233xJVPGN2RmbkSN30jbJh4FORL fYibmrHMLheLt1WsKDO4dyKIgThx2nNGdIQl0JiHjgG38l3z7z+lb1ogWzQG/InJC74/ /L8g== X-Gm-Message-State: AOJu0YwCHZxLloj0r6UnuN67meAocxVZAZ/BgMTnH+dz9ra2JmLm/O+w l21OYX4hdaid21kqB/ilk5eQxnr9sAAff+FWJOoXNagFkQIrCil0klpyroY0V/yW7oe1aPnsW/3 TPzrS X-Gm-Gg: ASbGncuJ7wlDSFavt/G/hyfFd2EwnDbuwRGgteAkDJmZPh8EyquHgMAkW8d4XDAgtnJ Dr/GkrtTJ7VsV2VVI8ky7rNLDpoFOzkEi/b7dTOSX8x1tibnT5Uh0HXi9IjYw+1mvonfLmOx4O3 GIQYpb2WAyIJtLAjSYcliokgdyoBdDCmODwx6s+ca+WbIREK7Iq6nZQyEBQKeZOQYv9z3LFDhKR VP7POS2ppu1p04uDGaY5O3Birv+SDWIvel79v1UgLRj3kV8BAjkoRp5AVJO1Np8/obZnhCkGnih a8Mv32j4cGlutRSpYzIzY0JQ+0KkFQ/2Ig3L1SHNb8Aiu4/yo5sBrJ2Duw5nh8fk5v2FL1wyS9B D5ugNMjn1wZJX/2++QVSERPAxziVIq4H4rz5y3POpbzuvueEQNRWBhHq7P2BtPg/uXHVudCNy9C E8H2OfXA== X-Google-Smtp-Source: AGHT+IGk1gKa08nlqPCZgi0XcgjZv8+HX7TF1+VVlbSzoxj1aWiBlgy+Y59OGW/LjGzj+oOliOnWnA== X-Received: by 2002:a05:600c:3485:b0:471:13dd:bae7 with SMTP id 5b1f17b1804b1-4773bfb51f8mr128886035e9.30.1762272592414; Tue, 04 Nov 2025 08:09:52 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Jonathan Cameron , Fan Ni , John Levon , Thanos Makatos , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Alex Williamson Subject: [PATCH 6/9] scripts/clean-includes: Update exclude list Date: Tue, 4 Nov 2025 16:09:40 +0000 Message-ID: <20251104160943.751997-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251104160943.751997-1-peter.maydell@linaro.org> References: <20251104160943.751997-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=peter.maydell@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 autolearn=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1762272698705154100 Content-Type: text/plain; charset="utf-8" Remove from the exclude list: * tests/plugin, which is a non-existent directory. This was probably intended to exclude tests/tcg/plugins/, which is caught by the tests/tcg exclude pattern anyway Add to the exclude list: * rust/ -- the headers in here are purely for input to bindgen * target/hexagon has some standalone tools used at build time * linux-user/gen-vsdo.c -- another standalone tool * linux-user/mips64/elfload.c just includes mips/elfload.c * scripts/xen-detect.c is feature-detection code used by meson.build * tests/tracetool/simple.c is autogenerated * tests/unit/ has some "C file just includes another one" files * include/system/os-wasm.h is like os-posix.h and os-win32.h and shouldn't be adjusted Signed-off-by: Peter Maydell --- scripts/clean-includes | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/scripts/clean-includes b/scripts/clean-includes index 694e12f062c..256ff5b5faa 100755 --- a/scripts/clean-includes +++ b/scripts/clean-includes @@ -96,10 +96,12 @@ trap 'rm -f -- "$COCCIFILE" "$REGEXFILE"' INT TERM HUP = EXIT # Comments starting with '#' are permitted grep -v '^#' >"$REGEXFILE" <"$REGEXFILE" < (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1762272773700862.836508569461; Tue, 4 Nov 2025 08:12:53 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vGJbs-0006nx-IJ; Tue, 04 Nov 2025 11:10:17 -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 1vGJbf-0006hp-36 for qemu-devel@nongnu.org; Tue, 04 Nov 2025 11:10:04 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vGJbY-0007Kt-Vi for qemu-devel@nongnu.org; Tue, 04 Nov 2025 11:10:00 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4775ae5684fso1765915e9.1 for ; Tue, 04 Nov 2025 08:09:54 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47754adcd08sm57314455e9.5.2025.11.04.08.09.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 08:09:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1762272593; x=1762877393; 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=/9TOmFmIqhyuzG6e0MA/YDMsMgH5yDWNQ+TpSTSyVlM=; b=Bs56HUKH2nG5hbzhOsWryzm5lFyYOeOD4V4tb1uOmYOE+GjYTJIAXzo6aBcZoXZZ9n trSVH1morn+tMx4CQJIFinKhq4nTZZVAbS0zBtlyJyab+ufyvDUbRwWALQgv8ix3RqRS 3ofUyRug0U42s//FP0tkPZ6RcUy3YgKv+tzU5nCPMAKtyF6QPMfjuY9U5B2dOTBdRzEH 4vSW/72O1Tv0/PSXC01ZXPlKKxZEFgmRoGgmzfmrsJpHGb4OY1tb3/zUCyJaV1JjSrD4 51PBKXNp1gjrftGher+iMjX7TrfG+rEGu6OTNKEqkPBJQVYswaZklo5OxkVJXw4VeudL b6xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762272593; x=1762877393; 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=/9TOmFmIqhyuzG6e0MA/YDMsMgH5yDWNQ+TpSTSyVlM=; b=XwDf/iedh/5bUwpkG43kotVfk2HkH/FQJA0WksGL5qDHEBw2YGOphgRV6H9kLT151A 3tFeXaqXotv97z59mXcamIykxJdpEqwuHIWDAUh1KzNyRaks2fUJNfn3LuYkBMuUq/Ez J9FpLcKPcs3RQ90pcYXxvEf99AFBV7cpE6P5JEjIdAjV5JN0P7+hWGINz89Hi/x7frpT tmiEpjOWO3QAgX5t1F7Jy2hdFRCfUNiteBwNRpciZGiOhXne0EcNJ9Ue0Yi6b6ZO+aj1 NiSuyPQTEOCnpZSRVoPoj1l2juo0ykwxgpa20sgoLiGI2eAiyigM1nvY++bFXEvr4hQl 18WA== X-Gm-Message-State: AOJu0YwlQnjLVVxYjC3EYtt728/LoAt/aRlqbW69gRH2CCPd0dhk2BpL RYrMPGhyAjRWXqKo0k+GcALmCEZBPXFKHRucVRco49QiYXumv/uTVrVUs9sRmVdVITSkTBm2cHv DY9pP X-Gm-Gg: ASbGncsSCLBgsWRlbBXuGztOgg9E8sXPBUFIzcdA99aXnjPGeE+Lo4DUsU6jo8vX2GT +0B88L3taoJD/moStwLpDy/GTsJltYlgWVvJ78EkoSMLzNvhZrmgMmjHMeprBNxruFh8ftfiS3g Dw5+7laEnXdy6CsiGEWQMgm9zngfii0yUf1XivELeL81NBH/YFya6gF+zjgCvg7u4xUetwFbe/6 AZJ4dA3OVPqPgt0tQAQjVkdk6wpo9zEtyVPZz0LI0r77OnCwbyWkDFU/F5vqdYpDmimeZKFXKTr tvH1+4Lq8Ob2OlTxIlNEJAjiEbM4rwikjLeqCsZq7G+al9sfH9CH6w52zUqj3ovwFTVepoEYhql wxqTY3h4jpOYr4CuD3m7hit1x8bZCv6z6yj7ztUcxs/N2Os5PjeKg6pAE2xz2+NscUVASWBuk93 O5jgh1Ag== X-Google-Smtp-Source: AGHT+IEboKozT2T2SPgevny/csOvI2uGVEwGbCoFmhWGnzRiVRI6S1l0aXX30LlFysEsypR7bOYY9w== X-Received: by 2002:a05:600c:3511:b0:476:4efc:8edc with SMTP id 5b1f17b1804b1-477307d9920mr141491715e9.15.1762272593390; Tue, 04 Nov 2025 08:09:53 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Jonathan Cameron , Fan Ni , John Levon , Thanos Makatos , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Alex Williamson Subject: [PATCH 7/9] cxl: Clean up includes Date: Tue, 4 Nov 2025 16:09:41 +0000 Message-ID: <20251104160943.751997-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251104160943.751997-1-peter.maydell@linaro.org> References: <20251104160943.751997-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x331.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 autolearn=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1762272780814158500 Content-Type: text/plain; charset="utf-8" This commit was created with scripts/clean-includes: ./scripts/clean-includes --git cxl hw/cxl hw/mem All .c should include qemu/osdep.h first. The script performs three related cleanups: * Ensure .c files include qemu/osdep.h first. * Including it in a .h is redundant, since the .c already includes it. Drop such inclusions. * Likewise, including headers qemu/osdep.h includes is redundant. Drop these, too. Signed-off-by: Peter Maydell Acked-by: Jonathan Cameron Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/cxl/cxl-mailbox-utils.c | 2 +- hw/mem/cxl_type3.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c index 68c7cc98912..6cfdd98168f 100644 --- a/hw/cxl/cxl-mailbox-utils.c +++ b/hw/cxl/cxl-mailbox-utils.c @@ -7,9 +7,9 @@ * COPYING file in the top-level directory. */ =20 +#include "qemu/osdep.h" #include =20 -#include "qemu/osdep.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" #include "hw/cxl/cxl.h" diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c index be609ff9d03..4f3688a71b6 100644 --- a/hw/mem/cxl_type3.c +++ b/hw/mem/cxl_type3.c @@ -8,9 +8,9 @@ * * SPDX-License-Identifier: GPL-v2-only */ +#include "qemu/osdep.h" #include =20 -#include "qemu/osdep.h" #include "qemu/units.h" #include "qemu/error-report.h" #include "qapi/qapi-commands-cxl.h" --=20 2.43.0 From nobody Sun Nov 16 01:07:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1762272696; cv=none; d=zohomail.com; s=zohoarc; b=EZzV5xvqrJDb+quxqubLzZI/G0aenXc7EINR1Ebx8iYxFS10idqX5/G7WQo9yPGKtYX3zjYnShjqqy3kY+WdDg1wDi/TGQVYl76RJFj/RKwUGH8YsD+kcZQ2xFXtWLX/J6Qd7BYJ2cDCWEJLUgWN6IKMvDRjnFJaIoO5uDW55WQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762272696; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=/5jT1nanV2HTon+gYa/5KcgwK7C7VkPnRzMePhdCgTY=; b=cPOySGiOi8KupJ0QvmyoXU2n6P6fGcS3+rXM57D3Q1RMN9hcken/DteNWOq1kAHbv/e0aqnQVMLHMBVK71tc8cwVFb5RN+HPk1ylo35ZkoVzY57k6hj/qp6NoRLxyJxZuLlx95sCd3T8lIwvXbPpbnKelRcj67PjaUFeTDm5nZw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1762272696424506.0737152699677; Tue, 4 Nov 2025 08:11:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vGJc0-0006rK-He; Tue, 04 Nov 2025 11:10:24 -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 1vGJbf-0006hr-3y for qemu-devel@nongnu.org; Tue, 04 Nov 2025 11:10:05 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vGJbb-0007L6-4n for qemu-devel@nongnu.org; Tue, 04 Nov 2025 11:10:02 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-47112edf9f7so46285835e9.0 for ; Tue, 04 Nov 2025 08:09:55 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47754adcd08sm57314455e9.5.2025.11.04.08.09.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 08:09:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1762272595; x=1762877395; 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=/5jT1nanV2HTon+gYa/5KcgwK7C7VkPnRzMePhdCgTY=; b=nwrdCwc5ls6sg6CzMLOwhMtNv7DFaTdy59KcbY3Y9yvX28+/oiMV9/Iz0tuvKtwUOq WdqNGBO7ZFN4OLFKR0VRFOemr4HW31wj3qMEgUrrDL/fpea4AfebWwzVStzZF0p77/Wf VXNZoynTuuMmSBXYHS8gsQFWrABoe9+OJxeTLo1xbOqg5lR5Fxw2x/HseF245cqfi0I5 OROHvesJT6QgQbJy2InSUT7pE/lu0i4OHGnoUL5oaebp45m4/3yV6S9/HmmxFzZs7HfD eUa+ot0Ws+AhFakdrnpYaxVJ4uN+HpaMgVw1IXN1epyS/UMQBep8VviVCS4YYhdCibiP YDxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762272595; x=1762877395; 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=/5jT1nanV2HTon+gYa/5KcgwK7C7VkPnRzMePhdCgTY=; b=FFAvzqdBFeH7BhPoBCblSu//uB9iDpk5UN8/bstCzXZuqah792ve3hCmExHEj6qvGY YWXgIKp7QJHer79T2XfARrFOaxcdG944Naq1/VMpeJv2TqyX1rKx5IpAWdPieuWmNvFE VOcQwDhnvQFdmtSpi7kILHyPVE3vTryKMCeh7ERgWgPb4SheBmfiATFYyxLa9/LRa/81 +mHJMkaSiXFLUe2jdqu6GQvFWsUv63v8/15eL9VOYhS9AcCQ2wnk+eaUxgjU/ILAgiAG fnULJOjgpt2b0Seu2oKtEA3d9yTwu+543CqpbDiU1E5V9+MNf3HLG+shJiHsshdOSMmM tZ/g== X-Gm-Message-State: AOJu0Yz+HBS7OuPGBmsed5H23K/Nz10gcPHQI9UgvC3LkphzUwre8Lql DZdtPdgo7Dw94pkP8dPSuXE8QuAoAPOc8TjDuF5fXIpoTW/NKYLXBa9W4VbZwdUn48MVmOg7VVp cSy07 X-Gm-Gg: ASbGncvH23L2XtjH01p7pQmAxTWcSlU4NYGvNbQUUkMPFdzf6w/zelNMJiRyf3ZEJCx rEvNlxJmn3txOsfAJWAqRRxFaMq9sR1pBeNwUbtXw0zo4TrxucAwjG9zW5r7S42/4+hhylXA33B Xxt6zc+GJDtrEAK4/Ep63PDASV3BWKJXd/YERwlKlkHnKD46iZ2IfZjhXdFkpADxwLvS1WqJ97I jtdgbUjtIVZwYSKf5+KrwiGdr3ODRLQL3cyvI1iBNo0wjTz7qOvuoW+7CpDcQ1d8uHuawTKuqMB E+T8v5EldT9TNR2oOjDrYSGjyTHfnulErVM9Vitct2EZJRoY5QU1xCdUqrjx19/SlX17spnKY1Z +Gt9sb3y3oFBmuqMIdyCk6mjWGV2I0wo4Dpwr1NmRfmk1Bp6NLCMePWTuLPRt/QPcsvL3BMWkZT elCVE/T7a8r/xEZkuo X-Google-Smtp-Source: AGHT+IFw0mHTVNQTPpVDHWOwRPNu28SoSm3vy3a0r7q4kvLWFQ2x1D7XC+YLnA6naNfmkaD+uC53Zg== X-Received: by 2002:a05:600c:190d:b0:46f:aac5:daf with SMTP id 5b1f17b1804b1-477308dbefdmr162934445e9.35.1762272594606; Tue, 04 Nov 2025 08:09:54 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Jonathan Cameron , Fan Ni , John Levon , Thanos Makatos , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Alex Williamson Subject: [PATCH 8/9] vfio: Clean up includes Date: Tue, 4 Nov 2025 16:09:42 +0000 Message-ID: <20251104160943.751997-9-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251104160943.751997-1-peter.maydell@linaro.org> References: <20251104160943.751997-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.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 autolearn=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1762272698704154100 Content-Type: text/plain; charset="utf-8" This commit was created with scripts/clean-includes: ./scripts/clean-includes --git vfio hw/vfio hw/vfio-user All .c should include qemu/osdep.h first. The script performs three related cleanups: * Ensure .c files include qemu/osdep.h first. * Including it in a .h is redundant, since the .c already includes it. Drop such inclusions. * Likewise, including headers qemu/osdep.h includes is redundant. Drop these, too. Signed-off-by: Peter Maydell Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/vfio-user/container.h | 1 - hw/vfio-user/device.h | 1 - hw/vfio/pci-quirks.h | 1 - hw/vfio-user/container.c | 2 +- hw/vfio-user/pci.c | 2 +- hw/vfio/ap.c | 1 - hw/vfio/container.c | 2 +- hw/vfio/cpr-legacy.c | 2 +- 8 files changed, 4 insertions(+), 8 deletions(-) diff --git a/hw/vfio-user/container.h b/hw/vfio-user/container.h index a2b42e3169d..c952e090631 100644 --- a/hw/vfio-user/container.h +++ b/hw/vfio-user/container.h @@ -7,7 +7,6 @@ #ifndef HW_VFIO_USER_CONTAINER_H #define HW_VFIO_USER_CONTAINER_H =20 -#include "qemu/osdep.h" =20 #include "hw/vfio/vfio-container.h" #include "hw/vfio-user/proxy.h" diff --git a/hw/vfio-user/device.h b/hw/vfio-user/device.h index d183a3950e2..49c05848f1a 100644 --- a/hw/vfio-user/device.h +++ b/hw/vfio-user/device.h @@ -9,7 +9,6 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ =20 -#include "qemu/osdep.h" #include "linux/vfio.h" =20 #include "hw/vfio-user/proxy.h" diff --git a/hw/vfio/pci-quirks.h b/hw/vfio/pci-quirks.h index d1532e379b1..a6282e063a1 100644 --- a/hw/vfio/pci-quirks.h +++ b/hw/vfio/pci-quirks.h @@ -12,7 +12,6 @@ #ifndef HW_VFIO_VFIO_PCI_QUIRKS_H #define HW_VFIO_VFIO_PCI_QUIRKS_H =20 -#include "qemu/osdep.h" #include "exec/memop.h" =20 /* diff --git a/hw/vfio-user/container.c b/hw/vfio-user/container.c index e45192fef65..dab7a23224c 100644 --- a/hw/vfio-user/container.c +++ b/hw/vfio-user/container.c @@ -6,9 +6,9 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ =20 +#include "qemu/osdep.h" #include #include -#include "qemu/osdep.h" =20 #include "hw/vfio-user/container.h" #include "hw/vfio-user/device.h" diff --git a/hw/vfio-user/pci.c b/hw/vfio-user/pci.c index b53ed3b456f..353d07e7819 100644 --- a/hw/vfio-user/pci.c +++ b/hw/vfio-user/pci.c @@ -6,8 +6,8 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ =20 -#include #include "qemu/osdep.h" +#include #include "qapi-visit-sockets.h" #include "qemu/error-report.h" =20 diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index 7719f245797..3368ac89150 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -10,7 +10,6 @@ * directory. */ =20 -#include #include "qemu/osdep.h" #include CONFIG_DEVICES /* CONFIG_IOMMUFD */ #include diff --git a/hw/vfio/container.c b/hw/vfio/container.c index 9ddec300e35..013a691bc5a 100644 --- a/hw/vfio/container.c +++ b/hw/vfio/container.c @@ -10,10 +10,10 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ =20 +#include "qemu/osdep.h" #include #include =20 -#include "qemu/osdep.h" #include "system/tcg.h" #include "system/ram_addr.h" #include "qapi/error.h" diff --git a/hw/vfio/cpr-legacy.c b/hw/vfio/cpr-legacy.c index 7184c939912..273b5978806 100644 --- a/hw/vfio/cpr-legacy.c +++ b/hw/vfio/cpr-legacy.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ =20 +#include "qemu/osdep.h" #include #include -#include "qemu/osdep.h" #include "hw/vfio/vfio-container-legacy.h" #include "hw/vfio/vfio-device.h" #include "hw/vfio/vfio-listener.h" --=20 2.43.0 From nobody Sun Nov 16 01:07:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1762272659; cv=none; d=zohomail.com; s=zohoarc; b=XGpic2AL2rHGBqPMeGXsjNsLFIPxcXzrrJkCFpqpW76OrA4gYTPce5sD0wTDns9SqQk7OAglPWv7QPy2DCqYYCYhCXUnP/UWyfDD479zJn/kfkgoxSmEr+7I0BygM+w8fcHdGX7r2lg2YEnXx/MJtJwiKaoFHQ0Id2MG6fBgEUQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762272659; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+hEVObdsJT1oTtwhAwuxIspzQ82F1zrFTt1fpB0p3nQ=; b=jmtDHV8dP2CiRCQWT8JbUiJDpim46BG45IqgoIFBOZfC4AFXpmGVBqXbN29Ypt7DnPwHxsv1XHCZPRUEPp3R78oN6QfKgfj2Rs96yh9JZK43npidjbOGrvgWQqUyZL1fexY//KlVMY/NvVd+7/izkU8x+I8e66rTefFoOrkDG/c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1762272659274639.0158519874434; Tue, 4 Nov 2025 08:10:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vGJc1-0006ry-Lq; Tue, 04 Nov 2025 11:10:26 -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 1vGJbg-0006iu-MV for qemu-devel@nongnu.org; Tue, 04 Nov 2025 11:10:05 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vGJbb-0007LG-4t for qemu-devel@nongnu.org; Tue, 04 Nov 2025 11:10:04 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-477563bcaacso6249625e9.1 for ; Tue, 04 Nov 2025 08:09:56 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47754adcd08sm57314455e9.5.2025.11.04.08.09.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 08:09:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1762272596; x=1762877396; 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=+hEVObdsJT1oTtwhAwuxIspzQ82F1zrFTt1fpB0p3nQ=; b=EkHaVtyAjtlYRa2AUDhya3t2u77u7T3jXnn8wvWmUL8ZWsnZD1d7YF/NVuqGEsblIT ff81Uv9R3n9KdE7gVdoy+bKBV6uzDLKIe4WFZS2BBuifOC3p0lnH41pDIBMpYrCP3Lck e3tTivmFFO1f+vqzRetBR5Su3ggIBADAWfChVq4JrqSdeO2bbI4a1GB4r3fs0K7UODEk KolcWe1Xby0tsBjg13RubbSK1VshIVe3aXSglXadTvUssSfFlCAmD9ZH12xekA/LfyU6 Ns63x5Xq7JXzT00IQTTICXPVWoIZsvY29QUCGH7/E59D1T3kXSGWuOe/kNICwf3cf/lp 8NLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762272596; x=1762877396; 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=+hEVObdsJT1oTtwhAwuxIspzQ82F1zrFTt1fpB0p3nQ=; b=F+C/Qdifp681lMxJID2Pa2jk5ViO3Y1sy49oGQ9acUri1MK0Fg8ZzLnYYlf02CSUqr fYBnV4O49VtQoP6fMQcOu5qSK0bE/gUXPyk1KuDZTftaaO3vNeC4Nuj8fxub1fJJoEWA pAihrJ190ul28c9B0bQhAD2FCamrdBNE9j3NfHsEd+8Ovb60FcvU7zaz0uE/Bzg+Iuh9 7Svd4i+2xKosN2qRCyfxSNBM9tavUEgCLvNPZjnltajqWVeWYJlZpu8MH9KowGN4NFtZ DotdqjQvjkSwb+L0ISqW99Zn8NR53UbjCEaHNKq4tOKs+IVV34xRX+Tahj6UGvTUP2sn Fo7w== X-Gm-Message-State: AOJu0YxQ6Zi9jNzEG9+ZApvJsbCWHW79opvTs6mVFVwXsQeCsQbd8w7x 2huW7zeO1Bf2tJaQQAG6Dmbj1JGeJK0SNqp8AtZhxzoc+XEN2X4swRs/R0b2+e3++94XuErhWTS W69PI X-Gm-Gg: ASbGncvgo4wZ9jF6k1vJQtHrQzElW0IMo/hjPJz+cyrASl3PM+PMJP1otq2rKX/TrMm IKVkJZIhR4ZQc3UiZOGEBq/fVf3S5Zj9dX90/zNv/KZJFubqWqGPcKy8liTDr8fp6QsJQ5xFKAw VoEq2FEoChum3JcWDxrrm4gFizUgnGPFkdjaCKXyTpfUeqEQhr5NUhOAGOh4HMUy1aCPvYsLjgK iYZqyGQrPV4kXBf3exsYDPFv82wu2fbQVDdoDixDjPyfomUEtIRis/rOc+0Xc+rWAV0HTxYQp4Q OeGb/wDbTe5p6+7VwXVihowJ0y9ZaLlrW4WhiMtYsa5bv09X43KidbOmj6JygIe7AlM3dfbp6nB littiDbafhi+gimXV3iscXH3BuDB7wgDyM2NaGzMUov+RAz6ZyiPyjPlLrsnxNN+KTAF7zxGwxH 0C6Rk22A== X-Google-Smtp-Source: AGHT+IFxJu+Idtm7BINARUFeLVnlHBVVShbfNbirprbsfxOvJ1uS+jcBP6brRdHSACjkiLhNhouCMw== X-Received: by 2002:a05:600c:1e25:b0:471:1306:aa0f with SMTP id 5b1f17b1804b1-477308b60d9mr149403185e9.38.1762272595858; Tue, 04 Nov 2025 08:09:55 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Jonathan Cameron , Fan Ni , John Levon , Thanos Makatos , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Alex Williamson Subject: [PATCH 9/9] tests: Clean up includes Date: Tue, 4 Nov 2025 16:09:43 +0000 Message-ID: <20251104160943.751997-10-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251104160943.751997-1-peter.maydell@linaro.org> References: <20251104160943.751997-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x333.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 autolearn=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1762272659747158500 Content-Type: text/plain; charset="utf-8" This commit was created with scripts/clean-includes: ./scripts/clean-includes --git tests tests with one hand-edit to remove a now-empty #ifndef WIN32...#endif from tests/qtest/dbus-display-test.c . All .c should include qemu/osdep.h first. The script performs three related cleanups: * Ensure .c files include qemu/osdep.h first. * Including it in a .h is redundant, since the .c already includes it. Drop such inclusions. * Likewise, including headers qemu/osdep.h includes is redundant. Drop these, too. Signed-off-by: Peter Maydell Reviewed-by: C=C3=A9dric Le Goater --- tests/qtest/aspeed-hace-utils.h | 1 - tests/qtest/aspeed-smc-utils.h | 1 - tests/qtest/aspeed_gpio-test.c | 1 - tests/qtest/dbus-display-test.c | 3 --- tests/qtest/pnv-spi-seeprom-test.c | 1 - tests/unit/test-cutils.c | 2 +- tests/unit/test-error-report.c | 1 - tests/unit/test-io-channel-command.c | 2 -- 8 files changed, 1 insertion(+), 11 deletions(-) diff --git a/tests/qtest/aspeed-hace-utils.h b/tests/qtest/aspeed-hace-util= s.h index c8b2ec45af2..27ab2bb9758 100644 --- a/tests/qtest/aspeed-hace-utils.h +++ b/tests/qtest/aspeed-hace-utils.h @@ -8,7 +8,6 @@ #ifndef TESTS_ASPEED_HACE_UTILS_H #define TESTS_ASPEED_HACE_UTILS_H =20 -#include "qemu/osdep.h" #include "libqtest.h" #include "qemu/bitops.h" =20 diff --git a/tests/qtest/aspeed-smc-utils.h b/tests/qtest/aspeed-smc-utils.h index b07870f3b8f..e2fd8ff1bd1 100644 --- a/tests/qtest/aspeed-smc-utils.h +++ b/tests/qtest/aspeed-smc-utils.h @@ -26,7 +26,6 @@ #ifndef TESTS_ASPEED_SMC_UTILS_H #define TESTS_ASPEED_SMC_UTILS_H =20 -#include "qemu/osdep.h" #include "qemu/bswap.h" #include "libqtest-single.h" #include "qemu/bitops.h" diff --git a/tests/qtest/aspeed_gpio-test.c b/tests/qtest/aspeed_gpio-test.c index c2f9ca2298a..decbba23c8f 100644 --- a/tests/qtest/aspeed_gpio-test.c +++ b/tests/qtest/aspeed_gpio-test.c @@ -27,7 +27,6 @@ #include "qemu/timer.h" #include "qobject/qdict.h" #include "libqtest-single.h" -#include "qemu/typedefs.h" =20 #define AST2600_GPIO_BASE 0x1E780000 =20 diff --git a/tests/qtest/dbus-display-test.c b/tests/qtest/dbus-display-tes= t.c index f7fc873bfb3..1d5951b7117 100644 --- a/tests/qtest/dbus-display-test.c +++ b/tests/qtest/dbus-display-test.c @@ -7,9 +7,6 @@ #include #include #include "libqtest.h" -#ifndef WIN32 -#include -#endif #include "ui/dbus-display1.h" =20 static GDBusConnection* diff --git a/tests/qtest/pnv-spi-seeprom-test.c b/tests/qtest/pnv-spi-seepr= om-test.c index 600493c425d..8033261758b 100644 --- a/tests/qtest/pnv-spi-seeprom-test.c +++ b/tests/qtest/pnv-spi-seeprom-test.c @@ -5,7 +5,6 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include #include "qemu/osdep.h" #include "libqtest.h" #include "qemu/bswap.h" diff --git a/tests/unit/test-cutils.c b/tests/unit/test-cutils.c index 227acc59955..75fae29003a 100644 --- a/tests/unit/test-cutils.c +++ b/tests/unit/test-cutils.c @@ -25,9 +25,9 @@ * THE SOFTWARE. */ =20 +#include "qemu/osdep.h" #include =20 -#include "qemu/osdep.h" #include "qemu/cutils.h" #include "qemu/units.h" =20 diff --git a/tests/unit/test-error-report.c b/tests/unit/test-error-report.c index 0cbde3c4cf5..a8532fc58fc 100644 --- a/tests/unit/test-error-report.c +++ b/tests/unit/test-error-report.c @@ -8,7 +8,6 @@ */ =20 #include "qemu/osdep.h" -#include "glib-compat.h" #include =20 #include "qemu/error-report.h" diff --git a/tests/unit/test-io-channel-command.c b/tests/unit/test-io-chan= nel-command.c index 4f022617df0..964418b5cd9 100644 --- a/tests/unit/test-io-channel-command.c +++ b/tests/unit/test-io-channel-command.c @@ -20,8 +20,6 @@ =20 #include "qemu/osdep.h" #include -#include -#include #include "io/channel-command.h" #include "io-channel-helpers.h" #include "qapi/error.h" --=20 2.43.0