From patchwork Thu Jan 25 16:33:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 765953 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1007:b0:337:62d3:c6d5 with SMTP id a7csp46940wrx; Thu, 25 Jan 2024 08:35:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IEfgJ/uOyV9m4U4K0ZOisUsgk2Ajvg+zMk6PErezlSHYtwU/slsGwR4JknMjbgoT8ocf8NX X-Received: by 2002:a05:620a:450c:b0:783:c808:4c8b with SMTP id t12-20020a05620a450c00b00783c8084c8bmr207955qkp.109.1706200550400; Thu, 25 Jan 2024 08:35:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706200550; cv=none; d=google.com; s=arc-20160816; b=r5g4/mkv/++kv1QS5tLCdmP0lh3UJbppKuIq+nQi8UTRmUgptXIJJhyB4TA6ZWvPiy B1wMSaW16ihYw7shUnaJochM6rGr4DAoc3fxjegOh5drUNUQxhA5zkDHZ+EWp6aQfR3R 5v+cUhYMLpBwV26GBH1wwCLT5CGlokOIabeDk8d1ACLGpwCJfNaFmiQ/IvQBq5H9oHiE 3Ho1QOXb7GCnkmuby92xUlEVhBXm8XsOzufCx1ik2rcWYH49wQjqRl5hiFUtZK1cTsKH RTVd0++K3TG3YJTTCozsI7UpEKjDyUKRj92izBfmcS5kAToU4WTvr2GqhoMmA5RK3KoB iwAQ== 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=anUa6cuHSmZzzEibxDgwncRp2+N6Aqc5mYUw8MYy6MY=; fh=kcov7vl7xxOd84pcsL/vu8Npa8ekHQuOCdhbB2+Xkxw=; b=ssN3T/ALwf1ZBLWs19hEAhHi9gPT92k6J5nBiHTOlTG85g4Zobmw2LgbVAb8kyToF6 /QfjFKT6v9guFTQ2nZpmBsnDgaeENUFBV6lxnsq1DS8jc7QStNB1/LW9uu/lZi0balOC 4YGDKOJ1OtasJT6u9x5bQP0XWScpSTEX+zQZXPDueYP/ukEBVITTvxAINPuzpvryVu3L kbtcoTGv/olg8aYODVnz6UXPMvGf1jHfd2iDkPlgJP3OCU7zHsYHxq+pvHQa968lFNg0 i+wia3TLTwR9Ju4azsxCfqR3QWd//cGEgmKr8dS8kEgtivsrpg/vhDzBk9U8DyAfJOBF KzjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MM4SVWXs; 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 v19-20020a05620a0a9300b0078368f6a499si12709848qkg.742.2024.01.25.08.35.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Jan 2024 08:35:50 -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=MM4SVWXs; 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 1rT2gE-0006qE-0P; Thu, 25 Jan 2024 11:34:18 -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 1rT2gC-0006oO-67 for qemu-devel@nongnu.org; Thu, 25 Jan 2024 11:34:16 -0500 Received: from mail-lf1-x12f.google.com ([2a00:1450:4864:20::12f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rT2g8-00027o-KC for qemu-devel@nongnu.org; Thu, 25 Jan 2024 11:34:15 -0500 Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-510218ab26fso623003e87.2 for ; Thu, 25 Jan 2024 08:34:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706200450; x=1706805250; 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=anUa6cuHSmZzzEibxDgwncRp2+N6Aqc5mYUw8MYy6MY=; b=MM4SVWXs+fX+UNG98SQN+nuhHOdoEZ0UZN8CCGp19RihZ5wOiV/zXvZqcicT4xpga7 YJj1NNStjfoXL/gLLknanQLBtkiq3Bmm0cmUisw8IRvnE/SqVEAWyQpL+eShGtrLth0P b6q2P4khUCJNkKZJG3QTTJgb0OztLxpPTzh7/imjbc43bZXaSAw2Dkr70N7rhyd5jkn8 G0YNb3C8jIToUu9HXm8IqJDkXxUhTVqhTB2bQExELsk6+HIUoUgO4DD9v3iD8HrSU8JP ia5sCaXm5phomK+mO1IzG60nSen0Mr9eCKhPMpJMwEyAT2y8Y49d1zsmqDewtfoWMtAZ O5FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706200450; x=1706805250; 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=anUa6cuHSmZzzEibxDgwncRp2+N6Aqc5mYUw8MYy6MY=; b=WbMh6QjEbW+hhHc7qckKwCtRuHvvUWOEy2McbZh7i+P7Bcemu97vtLuvTbWeFJoeV9 783vopRxsBCX1B703e8Q9HBnOcvFjWyKhr8ndZqysHc2y9cUn/C5uS17ZFPiuInvSBUX 6ZcwmgWvV0BlcDbMxmpVZrupM2UAANQPgx4jT0HgvRzy0U4vjOqpywqp+F8YjqnhvepX yyYb5f+jwmU8IaoQBKpqaBvvfhdmbdc3YnoIkhRwfwYplw4l/qgEAq8vyB+aGSjyFcCc +bpfcFJzDCN+Udky+AG13Lly1caVIsf/+6dL9KhcB5Owvc8jWs9IDkIrVsZv3ukD/tIX sgvw== X-Gm-Message-State: AOJu0YysKHfBIP5EYb9RU9izPwiqc7/vlThoh1PEEfAuYqQpRJH5/prI ggM0TLK+HpKgfSHQ1YJqm8fyFYLbj238e1bEHfy49xi4XNkg8ApSg9Or0hganvy2ZkxLYvqqIyf b X-Received: by 2002:a19:3849:0:b0:510:b6f:bec6 with SMTP id d9-20020a193849000000b005100b6fbec6mr56558lfj.39.1706200450062; Thu, 25 Jan 2024 08:34:10 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id p13-20020a05600c358d00b0040ea875a527sm3122208wmq.26.2024.01.25.08.34.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 08:34:09 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org Subject: [PATCH 01/10] scripts/clean-includes: Update exclude list Date: Thu, 25 Jan 2024 16:33:59 +0000 Message-Id: <20240125163408.1595135-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240125163408.1595135-1-peter.maydell@linaro.org> References: <20240125163408.1595135-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::12f; envelope-from=peter.maydell@linaro.org; helo=mail-lf1-x12f.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 Update the exclude list to exclude some more files which don't follow our standard #include policy. Signed-off-by: Peter Maydell --- scripts/clean-includes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/clean-includes b/scripts/clean-includes index 58e1607a82e..bdbf4040240 100755 --- a/scripts/clean-includes +++ b/scripts/clean-includes @@ -51,7 +51,7 @@ GIT=no DUPHEAD=no # Extended regular expression defining files to ignore when using --all -XDIRREGEX='^(tests/tcg|tests/multiboot|pc-bios)' +XDIRREGEX='^(tests/tcg|tests/multiboot|tests/fp|tests/plugin|tests/uefi-test-tools|pc-bios|subprojects|contrib/plugins|tools/ebpf|ebpf/rss.bpf.skeleton.h|linux-user/(mips64|x86_64)/(cpu_loop|signal).c)' while true do From patchwork Thu Jan 25 16:34:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 765950 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1007:b0:337:62d3:c6d5 with SMTP id a7csp46807wrx; Thu, 25 Jan 2024 08:35:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IGI59m2YYSL6WFoKdi5B8BApcd8MN1foQaq2PzU/5bczPJOwnaeGLSKcQQpxAoakk9qYAdo X-Received: by 2002:a05:620a:2298:b0:783:40da:323b with SMTP id o24-20020a05620a229800b0078340da323bmr1237475qkh.66.1706200532368; Thu, 25 Jan 2024 08:35:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706200532; cv=none; d=google.com; s=arc-20160816; b=L2YAxMxoPTeLBVzG03Bh7UOu7/8oUQj9uoqzpCNSmDm7IoMW7DnE63JQnpdoYBFWvw 8xmqNrk9CEjYcoOeMSfIgiG/hzRBjXDoJODSRevlSUJMqK7oFag1JFRlVuuDWn0dkhgw PlE2yEPj6Ixc6yraMdAWiBUFYuzZB5wPHgJRN4Dp5oVv7GL5C9TK+gW8Tvf72dB+QbQd sQMdbVG2R40/VuVZQX8EqSHtVcIEPAATvloiYI3MoIIeV+SyplioSd5wAwT5AFNXOpBi 6yLOYINmxu1TpPeeD+2Fp8UzMpu0KQ+SLzz+Rxx1uW1KpEWdL5XqnEgoe8vorC5RyXky tRfQ== 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=xcUJGzACtWHBMo3Dsdcr3bXAecU2iiyRxVi/UEQTqS4=; fh=kcov7vl7xxOd84pcsL/vu8Npa8ekHQuOCdhbB2+Xkxw=; b=k5R5mQomVvaRjvtYL+9eLkOfiiGGyLR0nJnyIzcqwL243j8c8V681q6wz7kfStbNX+ HSlKh0oBYUe5jmv5wHWcwbm+LjFRQutfFg8eKj+ddguGDkTpPtA/PPn44T+IL+sPOesn u2DVq5J0lovWobM2bZDxzrY/LVUNGBljK0Qfd+qDXdjf7qVPWFU918zCeO23vSo8qB0o o0EKE3UEaXXpwPETA6NqPcDLEDJIkBWpBq7wbUw3gnYjrlKaSl0GKG08iL3EDKPjkUsN O5oYn6Je1KI9dKVfirfs8Paui9OCWgAgWKDYSMlYOgLvKCujPLpmys7hf2MrpUtX7ZWb RQ/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WHlhMl+5; 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 v17-20020ae9e311000000b007836c6e0506si13066979qkf.14.2024.01.25.08.35.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Jan 2024 08:35:32 -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=WHlhMl+5; 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 1rT2gC-0006pW-Ve; Thu, 25 Jan 2024 11:34:16 -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 1rT2gB-0006kd-5r for qemu-devel@nongnu.org; Thu, 25 Jan 2024 11:34:15 -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 1rT2g8-00027q-2V for qemu-devel@nongnu.org; Thu, 25 Jan 2024 11:34:14 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-40ed232ea06so6744235e9.1 for ; Thu, 25 Jan 2024 08:34:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706200450; x=1706805250; 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=xcUJGzACtWHBMo3Dsdcr3bXAecU2iiyRxVi/UEQTqS4=; b=WHlhMl+5mBgjtAiH9fXiLu+gY7NCJoQj+Id1O7EHCM4/Hh+REqCKfqi1+4o1qDXN6i m/zfxx35tbocP0J9uwWwmN86mTSlFRmMezzxc4DG7H+PVLxqwQnImKAj8uifN5VVjRiF +Xaz5xQm7JqxtEdzQr1zLhzCuqrVA2oJQPmzENVRX61mAb98VIsvj3/YXb5xqhvB57Rh CCrpmOd+ywlfZ95FJnJkmMS+TxnoTzxUbEGeFGp3x0njvXVRTeNsqnP8L0HvVqBuEE7M mNUb/Zikul0kGfm+gNM7sRKwq8Czk/2Y4kwZDNXblecURIUtswd7Q9oaryhn657Gnmib Go9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706200450; x=1706805250; 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=xcUJGzACtWHBMo3Dsdcr3bXAecU2iiyRxVi/UEQTqS4=; b=ScEJrSRDvZj7HbaBJl+hf0hMSrhgT6Bguo8caMcMaQ2340nvkUBXVLxjFSCgv+GGCo Mr9/qjmGEnp7KhSm/T+qjOESSIohQ4zXtl7rxZhE0FonbIZr+TySIESD9QetMR07aAZO 456dHwwiFmnxAzXuEZ51MP2VSyEETtnsL2pV2poAw6dK40SvNxdXa2/cr7E9RgVQ+3m9 uvrGYAI2IHTO2/tLgdAPc+Y1Xrj0dSofiAvAwe98wTDj6CRVqP8Iyo/3BqcFE8Ec5TPH BRsYbHV4IswlIf0p5rp666eKBLNXw14pisSySLNmuDN+1ppm1O0Xr8scLnk0+HmbTqpE ASCw== X-Gm-Message-State: AOJu0YwLOl+GYKN9mGmqXao4E5Cjiha66KW57r9VwGJG+I6C3HexHKW+ acbYkkxiIbtvRjDj6w1g18HK1lB+sGeDigaCs6KXjA2fEY6cs+DwSs7v5Y8DiYZDLDu+oGkNX3r Z X-Received: by 2002:a5d:4dcd:0:b0:336:7300:f532 with SMTP id f13-20020a5d4dcd000000b003367300f532mr1072181wru.85.1706200450563; Thu, 25 Jan 2024 08:34:10 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id p13-20020a05600c358d00b0040ea875a527sm3122208wmq.26.2024.01.25.08.34.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 08:34:10 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org Subject: [PATCH 02/10] hyperv: Clean up includes Date: Thu, 25 Jan 2024 16:34:00 +0000 Message-Id: <20240125163408.1595135-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240125163408.1595135-1-peter.maydell@linaro.org> References: <20240125163408.1595135-1-peter.maydell@linaro.org> MIME-Version: 1.0 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, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This commit was created with scripts/clean-includes: ./scripts/clean-includes --git hyperv hw/hyperv/*.[ch] 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: Zhao Liu Reviewed-by: Richard Henderson --- hw/hyperv/hv-balloon-internal.h | 1 - hw/hyperv/hv-balloon-our_range_memslots.h | 1 - hw/hyperv/hv-balloon-page_range_tree.h | 1 - hw/hyperv/hv-balloon-our_range_memslots.c | 1 + hw/hyperv/hv-balloon-page_range_tree.c | 1 + hw/hyperv/hv-balloon.c | 1 + 6 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/hyperv/hv-balloon-internal.h b/hw/hyperv/hv-balloon-internal.h index 164c2e58253..ee53a28a266 100644 --- a/hw/hyperv/hv-balloon-internal.h +++ b/hw/hyperv/hv-balloon-internal.h @@ -10,7 +10,6 @@ #ifndef HW_HYPERV_HV_BALLOON_INTERNAL_H #define HW_HYPERV_HV_BALLOON_INTERNAL_H -#include "qemu/osdep.h" #define HV_BALLOON_PFN_SHIFT 12 #define HV_BALLOON_PAGE_SIZE (1 << HV_BALLOON_PFN_SHIFT) diff --git a/hw/hyperv/hv-balloon-our_range_memslots.h b/hw/hyperv/hv-balloon-our_range_memslots.h index b6f592d34b0..df3b686bc7c 100644 --- a/hw/hyperv/hv-balloon-our_range_memslots.h +++ b/hw/hyperv/hv-balloon-our_range_memslots.h @@ -10,7 +10,6 @@ #ifndef HW_HYPERV_HV_BALLOON_OUR_RANGE_MEMSLOTS_H #define HW_HYPERV_HV_BALLOON_OUR_RANGE_MEMSLOTS_H -#include "qemu/osdep.h" #include "exec/memory.h" #include "qom/object.h" diff --git a/hw/hyperv/hv-balloon-page_range_tree.h b/hw/hyperv/hv-balloon-page_range_tree.h index 07a9ae0da61..333772b86d2 100644 --- a/hw/hyperv/hv-balloon-page_range_tree.h +++ b/hw/hyperv/hv-balloon-page_range_tree.h @@ -10,7 +10,6 @@ #ifndef HW_HYPERV_HV_BALLOON_PAGE_RANGE_TREE_H #define HW_HYPERV_HV_BALLOON_PAGE_RANGE_TREE_H -#include "qemu/osdep.h" /* PageRange */ typedef struct PageRange { diff --git a/hw/hyperv/hv-balloon-our_range_memslots.c b/hw/hyperv/hv-balloon-our_range_memslots.c index 99bae870f37..1505a395cf7 100644 --- a/hw/hyperv/hv-balloon-our_range_memslots.c +++ b/hw/hyperv/hv-balloon-our_range_memslots.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "hv-balloon-internal.h" #include "hv-balloon-our_range_memslots.h" #include "trace.h" diff --git a/hw/hyperv/hv-balloon-page_range_tree.c b/hw/hyperv/hv-balloon-page_range_tree.c index e178d8b413c..dfb14852f42 100644 --- a/hw/hyperv/hv-balloon-page_range_tree.c +++ b/hw/hyperv/hv-balloon-page_range_tree.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "hv-balloon-internal.h" #include "hv-balloon-page_range_tree.h" diff --git a/hw/hyperv/hv-balloon.c b/hw/hyperv/hv-balloon.c index 66f297c1d7e..02383657124 100644 --- a/hw/hyperv/hv-balloon.c +++ b/hw/hyperv/hv-balloon.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "hv-balloon-internal.h" #include "exec/address-spaces.h" From patchwork Thu Jan 25 16:34:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 765955 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1007:b0:337:62d3:c6d5 with SMTP id a7csp47039wrx; Thu, 25 Jan 2024 08:36:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IEeFH6rXV+Avl+4i9WadpTVqTMffkHkmtcBkl6MhP38FCN+TcOvM6tDNKX7vIMil8WP3kVR X-Received: by 2002:a05:620a:10b9:b0:783:9aa5:bca4 with SMTP id h25-20020a05620a10b900b007839aa5bca4mr1419931qkk.87.1706200563962; Thu, 25 Jan 2024 08:36:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706200563; cv=none; d=google.com; s=arc-20160816; b=lJVADbSb6ViPz5UULTKqKzIK73FhQYbldgZGqdNEGq+TCxTdBABVBn0T/XykH915l5 FXGnBsYVnjJQ8OXhaVoiOvNxw1TFHLql2CVIVw8fb8vmbX0PTuP2Cn+t0+tzC9SNwiTR L3ZsRZ+V1lu05mnrYi8Jth3CI7dTRRUfWm8p/M+gaFksEjMYrhi1RaAftV5y5yFquC9P SdmUPfVfY2pX2ORLHEfkjlQRAMkDUawoFVEzs70YP7EMBCKwjP+WJnyXjPu3tp1S1Xhv 2XXp7YmQ5NkVndyqP8sPLRBV+hUQmeLB77EG111FjPtGcE6Z6n3vjsqqqxUJ5yQQUZqm 1AIA== 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=YHMUzgkXRP9wZQ4wL9pyKD3XATptA/6sivyW/DCZ/hM=; fh=kcov7vl7xxOd84pcsL/vu8Npa8ekHQuOCdhbB2+Xkxw=; b=OTAdzFE7r6w9t/RF90Vawsno8rZfG35IpNDpWltYzsTjAyEWVYzjVvOQzOR3B3Ql+2 6QqHicswKk8rnIIz2hEwVIc9E6FCE3pl3/Ge8TaHsSz1Qmt4l6ztvcHXldXR2srmKZXz A3WTfEL/Ob3a9f42arJ2JaKfIYdM6xoTVzPZn2E+LEL8FcnZ25QWATeXTNoTKWrSbCfE NhOqMYQ4XmnIJ+LGHJiAyoT1Nf1+9037vquoQkdbikrfzlavYRAV5RuGGW9rB1ZkH7Uq toLQew9PmWhF8myzh5Oo6VLsvzsA9/hHLFGB6QsWgi7vacRzJATy1hGarIzAZtF07e1U RXwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="bi/pruiC"; 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 h8-20020a05620a10a800b007811a26404bsi12863908qkk.768.2024.01.25.08.36.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Jan 2024 08:36:03 -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="bi/pruiC"; 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 1rT2gC-0006oJ-2a; Thu, 25 Jan 2024 11:34:16 -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 1rT2gB-0006kk-7j for qemu-devel@nongnu.org; Thu, 25 Jan 2024 11:34:15 -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 1rT2g8-00027z-DA for qemu-devel@nongnu.org; Thu, 25 Jan 2024 11:34:14 -0500 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-40e86a9fc4bso88963575e9.2 for ; Thu, 25 Jan 2024 08:34:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706200451; x=1706805251; 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=YHMUzgkXRP9wZQ4wL9pyKD3XATptA/6sivyW/DCZ/hM=; b=bi/pruiCm49nj9ILT+kpStwEwO9eaRdLx3QMegVjbGBUuXzPqMCfY/VLEiowyEi/ah sjm69QzKrnK33D0KCaHz2dlnm8r9wKoUQlfX5bFZQo8PYu67wvplJOyTMCYApYLiIU3F mtWhegm0KDyHn7H/ZddOJCeua6OtkInuu4ke9tG4Ah2lxjlzZnZzjX70wTRrIn+bJLBx AXzfLr4G7M9JTktV8zCTuxKi5ApGRRKwIG8ARVfW9okcIKwAFlTswzlb2BhMKIpOyvua RHHchnmSce+JKyWqIwOk+tlkWo1pSgCkvuYOstu1y78n/jB5zoPKoMOaTU4hWflKlgaA mpCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706200451; x=1706805251; 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=YHMUzgkXRP9wZQ4wL9pyKD3XATptA/6sivyW/DCZ/hM=; b=d1+THOKiV27IOdOUAw+WRQxqgcAySD8fYtgF352vNQjpI5hOG9FJDmXTO37VKqG04A AexjgcD9E1m0n24+02AykvtBifDUR06yUdE2ZcCOL56E4Vx1MevDDb2LDjlUD7OEf3mQ TCq2qsvfUg/q7x26ETqwupty9grtLHTj4rGFzgb3s1PL2WO/03619xSdLDvZ4/5nwHNQ RNJSRVA9ezcipIiuqQZqQVQSkERxohPpsQtjYZaB9gWvorSNpuazdnNrL/YzDZe8S/i3 ftiHu6wQhlhnclsF8GK/27lJl+/G1ypedOnIrtoxoKt6iXtY6D+082MdysnYMZCVVOKD nyCQ== X-Gm-Message-State: AOJu0YxAIK+uiRzrGtrO6mFFE5IKsY8kuPqv/IuwIIN0r0u8vVY+M+Sr lQ7w5QwWvnIOdVag6qz0XOfqhqQe85fFRiVDpQ64oMkRA+9TqxC8u68aDirKQixH8H6w1ErZsAF + X-Received: by 2002:a05:600c:22c7:b0:40d:9061:b8 with SMTP id 7-20020a05600c22c700b0040d906100b8mr743699wmg.223.1706200450979; Thu, 25 Jan 2024 08:34:10 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id p13-20020a05600c358d00b0040ea875a527sm3122208wmq.26.2024.01.25.08.34.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 08:34:10 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org Subject: [PATCH 03/10] disas/riscv: Clean up includes Date: Thu, 25 Jan 2024 16:34:01 +0000 Message-Id: <20240125163408.1595135-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240125163408.1595135-1-peter.maydell@linaro.org> References: <20240125163408.1595135-1-peter.maydell@linaro.org> MIME-Version: 1.0 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, 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 This commit was created with scripts/clean-includes: ./scripts/clean-includes --git disas/riscv disas/riscv*[ch] 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: Philippe Mathieu-Daudé Reviewed-by: Zhao Liu Reviewed-by: Richard Henderson Reviewed-by: Alistair Francis --- disas/riscv.h | 1 - disas/riscv-xthead.c | 1 + disas/riscv-xventana.c | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/disas/riscv.h b/disas/riscv.h index 19e5ed2ce63..16a08e4895c 100644 --- a/disas/riscv.h +++ b/disas/riscv.h @@ -7,7 +7,6 @@ #ifndef DISAS_RISCV_H #define DISAS_RISCV_H -#include "qemu/osdep.h" #include "target/riscv/cpu_cfg.h" /* types */ diff --git a/disas/riscv-xthead.c b/disas/riscv-xthead.c index 99da679d16c..fcca326d1c3 100644 --- a/disas/riscv-xthead.c +++ b/disas/riscv-xthead.c @@ -4,6 +4,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ +#include "qemu/osdep.h" #include "disas/riscv.h" #include "disas/riscv-xthead.h" diff --git a/disas/riscv-xventana.c b/disas/riscv-xventana.c index a0224d1fb31..cd694f15f32 100644 --- a/disas/riscv-xventana.c +++ b/disas/riscv-xventana.c @@ -4,6 +4,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ +#include "qemu/osdep.h" #include "disas/riscv.h" #include "disas/riscv-xventana.h" From patchwork Thu Jan 25 16:34:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 765951 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1007:b0:337:62d3:c6d5 with SMTP id a7csp46830wrx; Thu, 25 Jan 2024 08:35:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IHG3svHk1lKyWIaVEm1pwF96G73/7qoQJ3vIfdvXtLCFxNeN+criykNGIYx5k1N5yuxJxgO X-Received: by 2002:ad4:5e8e:0:b0:681:674b:1b4 with SMTP id jl14-20020ad45e8e000000b00681674b01b4mr1528453qvb.127.1706200535897; Thu, 25 Jan 2024 08:35:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706200535; cv=none; d=google.com; s=arc-20160816; b=HfeywNawGYPncuvczrbCT9JXrGKdNu4Qokf1X7tlR1xvkxiaNvQlAS5l7qpg5NKkAn Pxmfit5MxejfZnjvpRLcwFh/OSPzwkQYsqk7r/Kn3V0TCHj5tIGZRoFBp7mswXkwp4GM iHtiZuzE/uI2fBQUEvF24jI8h7uWozwpdCDVgWC0q9MH1cCGefBoC2I7eNytfGA3eZj1 EdZInfx2HcizDpEM1+wCuGGZ9dI/59sk+KbNhU4vgi6oq/ftO4eDo+Pv5R3YOXmHlpLH rQAjvYZMUq+chRd+f7b5vJIiGAO34nVcc4wpAHZXehUEd8gPglF2A3htdEPaXiCIXrKX XjXA== 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=nXb190+lhYx3lCV3waqp1Pgx9RLFbwQo2doe5u6vJo0=; fh=kcov7vl7xxOd84pcsL/vu8Npa8ekHQuOCdhbB2+Xkxw=; b=W/15xCGeHmYDBROhyfiG6EtUn46APo9cU499HGGnmRo48b9p3lqrz/MPDt98CzxoA9 gKcdRU37502MYxthMSP9ypmQqqpbDrhZtwipia4RSdwM9j9+AdivHxGOlc79T5AK6H7P Lc35aJcpPtyIm5Fy3xH+LOTwAg53f3lQ4zBcxe/dkumdJ1+1c1jtsbfpPgBSPjqDrEBJ A28p37BDhSVnWXOkXtNo54o1Vq1+k22drHaUv/dVkEQJ+YOQrSCAH03txTm+X23zQO4v Z1EOn7cfVwJfUuIwnZf0mmnSgsx2pv9reyuM+aOqQVbyRcBIbJLjpRwNQDVn1Syl8orm p68w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jQacrLeE; 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 d16-20020a0cb2d0000000b0067f032d7c53si13872739qvf.112.2024.01.25.08.35.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Jan 2024 08:35:35 -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=jQacrLeE; 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 1rT2gE-0006qp-JR; Thu, 25 Jan 2024 11:34:18 -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 1rT2gC-0006oX-E2 for qemu-devel@nongnu.org; Thu, 25 Jan 2024 11:34:16 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rT2g8-000287-Uz for qemu-devel@nongnu.org; Thu, 25 Jan 2024 11:34:16 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-40e76109cdeso77101775e9.0 for ; Thu, 25 Jan 2024 08:34:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706200451; x=1706805251; 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=nXb190+lhYx3lCV3waqp1Pgx9RLFbwQo2doe5u6vJo0=; b=jQacrLeElBhY2VsPUmiiTHp7LMo43BnnTLv8I/3I9vB9xIzQC9BYIm3oMJDQ2KzQ5z uuzQMIdctBqFy17glRDaxwFieQwwomoiQzQ2ONqGl49tCUoF5Q8dvaHHXetlY4+ST17P Fffl8iC/E5qOwOxtdV6wnhH5rpcKIWqPR/17p6cDJRMd6uVrkeBVZ1ZqB6GEN31UQ0TQ 3Oq8lAMbVRzm0sneGP2Tjlvi7nXE9cia0Q8zow6cru8kP1zw1ZumcwA7BTlkxUjIUJk2 lZIHy+zxxOONCxg05XDIIzjm4S3FbPUlb8G36blFTAr1s9hrcV87klwix2PmsjoP4pxe YguA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706200451; x=1706805251; 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=nXb190+lhYx3lCV3waqp1Pgx9RLFbwQo2doe5u6vJo0=; b=VUR1mB2CQb+7YvnyAQjHFvqMlVvjhJ+7V4qnVNp9a3BGEw7J+ruB66J2yLS2njvbnM KwclgWWqbh9/7Wx9ALaKOCRkN1jaZ+bqbt4LRY6rCwjwSgoGaZwa9VS5VLqgijhmndPa ZGiQqKbHDSToR5ap2+u29mXiXO/+XR7N9vvqoppKFO0ZDWCSCzc+YC21uCJBKyd6tkru n0EazAVNcLPtofdrcQsRicL9tDbCwDdSte81QQMYT89ImuBOHgTgnQq/q27gploBx9z8 Hnm1PjnR54TQcsMMjnPJGSdmLSa7IZxP3FQsKP70M7LtMD3V5bRSK6KFRC0tp2I48C41 8/8w== X-Gm-Message-State: AOJu0Yz873QtDpI7gaZj4WSosqUSESBiNOl9GhBfE8u5ahId0CwbjffQ JpboVHKnCUIvg4X0WnLEIMYLWFboqqEAAXweXVHBb0V2JZFfIIPywCE+dXsJX77+u/9G3UH0JiQ 2 X-Received: by 2002:a05:600c:a01:b0:40d:7d87:6730 with SMTP id z1-20020a05600c0a0100b0040d7d876730mr716948wmp.101.1706200451391; Thu, 25 Jan 2024 08:34:11 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id p13-20020a05600c358d00b0040ea875a527sm3122208wmq.26.2024.01.25.08.34.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 08:34:11 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org Subject: [PATCH 04/10] aspeed: Clean up includes Date: Thu, 25 Jan 2024 16:34:02 +0000 Message-Id: <20240125163408.1595135-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240125163408.1595135-1-peter.maydell@linaro.org> References: <20240125163408.1595135-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x335.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=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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This commit was created with scripts/clean-includes. 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: Philippe Mathieu-Daudé Reviewed-by: Zhao Liu Reviewed-by: Richard Henderson --- hw/arm/aspeed_eeprom.h | 1 - tests/qtest/qtest_aspeed.h | 2 -- hw/arm/aspeed_eeprom.c | 1 + 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/arm/aspeed_eeprom.h b/hw/arm/aspeed_eeprom.h index bbf9e54365b..f08c16ef506 100644 --- a/hw/arm/aspeed_eeprom.h +++ b/hw/arm/aspeed_eeprom.h @@ -7,7 +7,6 @@ #ifndef ASPEED_EEPROM_H #define ASPEED_EEPROM_H -#include "qemu/osdep.h" extern const uint8_t tiogapass_bmc_fruid[]; extern const size_t tiogapass_bmc_fruid_len; diff --git a/tests/qtest/qtest_aspeed.h b/tests/qtest/qtest_aspeed.h index 235dfaa186a..d35b0c7cba5 100644 --- a/tests/qtest/qtest_aspeed.h +++ b/tests/qtest/qtest_aspeed.h @@ -12,8 +12,6 @@ #ifndef QTEST_ASPEED_H #define QTEST_ASPEED_H -#include - #include "libqtest.h" #define AST2600_ASPEED_I2C_BASE_ADDR 0x1e78a000 diff --git a/hw/arm/aspeed_eeprom.c b/hw/arm/aspeed_eeprom.c index ace5266cec9..daa3d329d10 100644 --- a/hw/arm/aspeed_eeprom.c +++ b/hw/arm/aspeed_eeprom.c @@ -4,6 +4,7 @@ * SPDX-License-Identifier: GPL-2.0-only */ +#include "qemu/osdep.h" #include "aspeed_eeprom.h" /* Tiogapass BMC FRU */ From patchwork Thu Jan 25 16:34:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 765949 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1007:b0:337:62d3:c6d5 with SMTP id a7csp46705wrx; Thu, 25 Jan 2024 08:35:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IH++BbTZfXqMmFE+lXjdeE3ZtJABquhdVqZAXwjY0XFYGAXEi7/YTIahjuU4u5Oe7Ve4ZGl X-Received: by 2002:a05:6214:246f:b0:681:57da:2345 with SMTP id im15-20020a056214246f00b0068157da2345mr1444617qvb.67.1706200520779; Thu, 25 Jan 2024 08:35:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706200520; cv=none; d=google.com; s=arc-20160816; b=mWeK+AVzgtm+e7mBAPXUO6bHqy9lXtmslKsCFuFnHFitJhFoOdKvIU0NmJq1CO9hco mK6gFMUsz3+lK0opVtyiEwd1fhm7lwo/EuqmKTe304b7hlxbczrdYZeK9Vmae0kthCpd 4521X4cubk7VOI6JjUDGvyopuduzAWlJ2AoBbw+2iL/5Lfoely94a3PJv81MnTSX2ABY FmJCzYoreLhjm0MRRushKe/vCuhvK0NYJzkqBcP/bX9/t+XZrmdhrYxwoMXYnJOE7OvE Oc8tCKMSXY6wkdv5y4Ks+WPP/1BV1k+6eO+uEt4l1tNty64mdeBIap+I+P0HUFflpxFA oPLg== 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=mFd2PHs04WAsVFPzXYILuTHvIcBM7o5Jl0UfF56ciXM=; fh=kcov7vl7xxOd84pcsL/vu8Npa8ekHQuOCdhbB2+Xkxw=; b=0s6m/YCskrIT8SfZMJN4wYfk9U1ixOm4lje9CImfHouM2NXJ9YSah1Pr51VEkKuuwh 4OHX9bC391hxh8bYD6mL6DZvvGPzWAWHbYqXcnLRM3EfWc0NaPfHQzx+5cBDJsKcpuNm Rrq8r5QXTpnYZvRsKCEOKnZBwlNMcPmk92CSf6NG/Ch/OXwv566AosmQTDE4fF/uUkDn NUQ0fKfd/A8n3wwrAjGFGseCdUWXk1vfkFEJODYyb3aq8PFqM3PaBdTd0rgZOzZMjb0p EXHzzcyyt98sR5XCbY0yzjxZNPAMR0nLdF8enpEsW67z3bTgi5kVDU0fN003Quu1r4Zs cqvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iNXgz+VD; 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 i29-20020a0cab5d000000b0067f340d32b6si13377824qvb.199.2024.01.25.08.35.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Jan 2024 08:35:20 -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=iNXgz+VD; 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 1rT2gF-0006rI-5l; Thu, 25 Jan 2024 11:34:19 -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 1rT2gD-0006pe-HE for qemu-devel@nongnu.org; Thu, 25 Jan 2024 11:34:17 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rT2g9-00028S-3I for qemu-devel@nongnu.org; Thu, 25 Jan 2024 11:34:17 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-40e72a567eeso82647545e9.0 for ; Thu, 25 Jan 2024 08:34:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706200451; x=1706805251; 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=mFd2PHs04WAsVFPzXYILuTHvIcBM7o5Jl0UfF56ciXM=; b=iNXgz+VD2sE5uEk8nagwImqcml5Korc/70Y4/Vh6zYT3ow9crtIlhiHAGSbd/LTTrN AzXmkmVht1w11TGa8QXeBytbXM8h4C+ny804/33NSz764tPKKgq/MRK2t+PFAdX1Hsia TBwK4031PqosdEKxJvw3pXcUwcb60LdnaCoT5srsCWUqLyB66LAqhGFi6flNVXjJtSIF CSldTdOEXPw307T3QYUKO4K1nJJZo6nuXAssCGSRGGb427NFrvc7WQhfUe5DSxf2H7LF i0bs+vdJBUFL912PbgwLO/fQ0RyWNvcLYvccpaD/DIn/aI7Z3Ai1WVlGpYq6ezanFzwO hesQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706200451; x=1706805251; 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=mFd2PHs04WAsVFPzXYILuTHvIcBM7o5Jl0UfF56ciXM=; b=Ut2Tnf7j5R+X4Vd0Q8OB5jaAn4FBqRlPTONgUUpZa1V1R8IsIucgmfD9DMytuHZUT1 naPvSGZ0nq/InTsgxaBcjPlYx0KeWpUCRt/jyKT5L6G9nhHhjvej6MtEy+0FU+nqa8tS hYV4tLd0Mqe9iZQDtc1ohXUV30rcQWFEx1R98dT8liD4NOFzUyhywowIiMHGhotQ6xyv V0cF+8qjsRvRcGr/Rm+uxVpcUw/zTXhQE3e3AkzIlTW8LydKCQ6vjuEaXDCsqB1a2UkY WsIfHqcTuKwovN/nYL5WYsSBh6XTpoauyPT/NHkBW5nzFKiIOyAn2yIs+lt53y2rhsqA iIrA== X-Gm-Message-State: AOJu0Yzlgo//EmIcXc3R7nnR+/gm7A5HcF7O63Ssx9RVCK7e/cBEfdk5 18J6K12HNhIYH9lxHtu3pfE2mX6u628vrV2w5WvguhRYCoYlzfedSDu1QDr2pCnajhmzU4v6ymf t X-Received: by 2002:a05:600c:470f:b0:40e:d435:b877 with SMTP id v15-20020a05600c470f00b0040ed435b877mr2173wmo.112.1706200451794; Thu, 25 Jan 2024 08:34:11 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id p13-20020a05600c358d00b0040ea875a527sm3122208wmq.26.2024.01.25.08.34.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 08:34:11 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org Subject: [PATCH 05/10] acpi: Clean up includes Date: Thu, 25 Jan 2024 16:34:03 +0000 Message-Id: <20240125163408.1595135-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240125163408.1595135-1-peter.maydell@linaro.org> References: <20240125163408.1595135-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x329.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 This commit was created with scripts/clean-includes: ./scripts/clean-includes --git acpi include/hw/*/*acpi.h hw/*/*acpi.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: Philippe Mathieu-Daudé Reviewed-by: Zhao Liu Reviewed-by: Richard Henderson --- include/hw/nvram/fw_cfg_acpi.h | 1 - include/hw/virtio/virtio-acpi.h | 1 - hw/nvram/fw_cfg-acpi.c | 1 + hw/virtio/virtio-acpi.c | 1 + 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/hw/nvram/fw_cfg_acpi.h b/include/hw/nvram/fw_cfg_acpi.h index b6553d86fcb..b39eb0490ff 100644 --- a/include/hw/nvram/fw_cfg_acpi.h +++ b/include/hw/nvram/fw_cfg_acpi.h @@ -7,7 +7,6 @@ #ifndef FW_CFG_ACPI_H #define FW_CFG_ACPI_H -#include "qemu/osdep.h" #include "exec/hwaddr.h" void fw_cfg_acpi_dsdt_add(Aml *scope, const MemMapEntry *fw_cfg_memmap); diff --git a/include/hw/virtio/virtio-acpi.h b/include/hw/virtio/virtio-acpi.h index 844e102569e..cace2a315f4 100644 --- a/include/hw/virtio/virtio-acpi.h +++ b/include/hw/virtio/virtio-acpi.h @@ -6,7 +6,6 @@ #ifndef VIRTIO_ACPI_H #define VIRTIO_ACPI_H -#include "qemu/osdep.h" #include "exec/hwaddr.h" void virtio_acpi_dsdt_add(Aml *scope, const hwaddr virtio_mmio_base, diff --git a/hw/nvram/fw_cfg-acpi.c b/hw/nvram/fw_cfg-acpi.c index 4e48baeaa01..58cdcd3121c 100644 --- a/hw/nvram/fw_cfg-acpi.c +++ b/hw/nvram/fw_cfg-acpi.c @@ -4,6 +4,7 @@ * */ +#include "qemu/osdep.h" #include "hw/nvram/fw_cfg_acpi.h" #include "hw/acpi/aml-build.h" diff --git a/hw/virtio/virtio-acpi.c b/hw/virtio/virtio-acpi.c index e18cb38bdbe..230a6695001 100644 --- a/hw/virtio/virtio-acpi.c +++ b/hw/virtio/virtio-acpi.c @@ -4,6 +4,7 @@ * */ +#include "qemu/osdep.h" #include "hw/virtio/virtio-acpi.h" #include "hw/acpi/aml-build.h" From patchwork Thu Jan 25 16:34:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 765952 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1007:b0:337:62d3:c6d5 with SMTP id a7csp46905wrx; Thu, 25 Jan 2024 08:35:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IHiFcynpXJ09TS69YCW2VpxKbj4klOGR+zAYArC285pvucR5hOodBNlFIGLmSM8Gef7+3jK X-Received: by 2002:a05:6102:3215:b0:46b:e8:b954 with SMTP id r21-20020a056102321500b0046b00e8b954mr730496vsf.6.1706200545171; Thu, 25 Jan 2024 08:35:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706200545; cv=none; d=google.com; s=arc-20160816; b=rVJevsyUcvrXyi2mwikEOnJ319+5jJGMxzJMY8UZ163X+n7WgLe3CJhsAvBcRhDzWD ivTL5SHX3Mf6nDGWFgAPOKvhruhGKqtAXhnyUdlOQufSnDq0anOF8RTUeVQkAJIs689O 2Y2sJnZjbs3Gy0lzDTyGmwNXoz7qepsg4jFUjL11CdIwENpnxoydGNfety39rP6Ud7gc 9NDJoOr+qnMw6fHQYylMJS/QFeLrxyHooAclqnTMOXV3VN28w6snfd834566tizcZAxo c5MwVfb7nDscK1SiW1g5UIv4gWNHrA4iBx/aRP9UpAmiYLrTAb08W+30xP7ZmuWCQA9a Lx3A== 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=1djk9Mx2e66FY1I90FdC46YRiQSkTTbTopB41mRqY/E=; fh=kcov7vl7xxOd84pcsL/vu8Npa8ekHQuOCdhbB2+Xkxw=; b=y/r5LIWhLT3Ql7FRd84JL7njEdZzftPaQ+jjUGLf+2OiNyp5eTzD4Rwj0j356/IvtI LmI2u5niENAue8AS5JIBLVGdILMcWwR7+XrFgbxiKfMZWy0ngjefS9b0ImJ84o4CR43G xz6p1oJsNRE7rL/nS+MyZLasBHKNNTqKFZYGmYo7fbLjypP0B0XG2C50yHE+DSGfNS8n usWV+4J0SPLI/wB36HFUrSWCwCwtOMQTLcu1FhOWvGfmWoRF1FAEJb0Vxda6hnNXp1uJ dq/Dl3eEbnNEhsD1Bb0Ku80YY42l+HDMGL8EC1q/NIgrNbz2LNQ0EBSwNK/hU/017jL0 dP7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BT2Q5L6F; 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 n24-20020a67ee98000000b0046afb745a09si777875vsp.290.2024.01.25.08.35.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Jan 2024 08:35:44 -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=BT2Q5L6F; 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 1rT2gF-0006rM-74; Thu, 25 Jan 2024 11:34:19 -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 1rT2gD-0006pg-Jp for qemu-devel@nongnu.org; Thu, 25 Jan 2024 11:34:17 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rT2g9-00028c-Lu for qemu-devel@nongnu.org; Thu, 25 Jan 2024 11:34:17 -0500 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3392b045e0aso4741618f8f.2 for ; Thu, 25 Jan 2024 08:34:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706200452; x=1706805252; 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=1djk9Mx2e66FY1I90FdC46YRiQSkTTbTopB41mRqY/E=; b=BT2Q5L6FPLJcD/jSKXnk249PDNrv6ov26TMQcaHHnPc8X/JGUzcS9SgQO1IjmBW3iz OrGc1vt2Bg9BeNDrfRJ7mn5WaOOdmnHJ6TSOfMTg2mkh6iQJ5vR6DfKtI8fMthzbZg5l ZJ0XEP3C1ZYJBaHTP8F0ni9wIOgZF0rsjtUdWDd0DiCUoPcY9C/r/bjo7d2VT6mKJUum j0WCgEVc3id9s+czxpW5BusmrjmvdhFK8w2c+mdECBEnts5AyxyGCD4xnft9KnOO+1n0 T5pSCm9lfHKGHAIQaYSQ66/Klf6G966Q8WsVKGB+t+WFp07qkcxpJtPSoABmF+dE6x1w lmGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706200452; x=1706805252; 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=1djk9Mx2e66FY1I90FdC46YRiQSkTTbTopB41mRqY/E=; b=KQHFjG1SKbk21u//DSXlVZ9QHee2814x+9mUfNBXjnRzCKS2h6SvzbNwVeehsEofos Yafj2RmbRK4fyYS+MX/WOWjwwP29NOUVc3GJvJylYJyMBZL/de9AioNr7iX9KLUI2mXx qrrNCRDZKqd0HRC4xosy+LUYt1fyiUyjgRUVPNXor0+eacMlrC7UlfMqZ8KFvMLF/TJk QiqBX4FrpGs3i260ICbX3bhWjNeN66rKVF4Mn0HA0VrgtSaNChOYsA7VcqWTjaK/k1vr rEjjn8rpfK3LaU7h4ZdffkvXZcCBsiJcvYQIGUZTM8GEtpyWseIEeq2PAde0iBUymtGW Zr0A== X-Gm-Message-State: AOJu0YzJj9BQHzSYyQG0lXz3AaNbtj5HsQlwkqXDSAI8kVVuglM2e8nl gSSjA24mQVPptSaXoF1PsGuZSgIAcGkYsVEYA22r46yp7PjH5U1eFnOaQ6ladp/pUYbOpltq5il C X-Received: by 2002:a05:600c:5022:b0:40e:d232:b5cb with SMTP id n34-20020a05600c502200b0040ed232b5cbmr558309wmr.195.1706200452194; Thu, 25 Jan 2024 08:34:12 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id p13-20020a05600c358d00b0040ea875a527sm3122208wmq.26.2024.01.25.08.34.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 08:34:11 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org Subject: [PATCH 06/10] m68k: Clean up includes Date: Thu, 25 Jan 2024 16:34:04 +0000 Message-Id: <20240125163408.1595135-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240125163408.1595135-1-peter.maydell@linaro.org> References: <20240125163408.1595135-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x430.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=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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This commit was created with scripts/clean-includes: ./scripts/clean-includes --git m68k include/hw/audio/asc.h include/hw/m68k/*.h 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: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Zhao Liu --- include/hw/audio/asc.h | 1 - include/hw/m68k/q800-glue.h | 1 - 2 files changed, 2 deletions(-) diff --git a/include/hw/audio/asc.h b/include/hw/audio/asc.h index 4741f92c461..04fac270b6a 100644 --- a/include/hw/audio/asc.h +++ b/include/hw/audio/asc.h @@ -13,7 +13,6 @@ #ifndef HW_AUDIO_ASC_H #define HW_AUDIO_ASC_H -#include "qemu/osdep.h" #include "hw/sysbus.h" #include "audio/audio.h" diff --git a/include/hw/m68k/q800-glue.h b/include/hw/m68k/q800-glue.h index ceb916d16c1..04fac25f6c2 100644 --- a/include/hw/m68k/q800-glue.h +++ b/include/hw/m68k/q800-glue.h @@ -23,7 +23,6 @@ #ifndef HW_Q800_GLUE_H #define HW_Q800_GLUE_H -#include "qemu/osdep.h" #include "hw/sysbus.h" #define TYPE_GLUE "q800-glue" From patchwork Thu Jan 25 16:34:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 765947 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1007:b0:337:62d3:c6d5 with SMTP id a7csp46667wrx; Thu, 25 Jan 2024 08:35:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IF4h8w7ng3SlCkRfTQAvHTobXtFIDRhC/dCJL+ln+gXRe2d84UmgsZwFdTgZRdx25ZFt87I X-Received: by 2002:ac8:534b:0:b0:42a:6eeb:62d1 with SMTP id d11-20020ac8534b000000b0042a6eeb62d1mr525129qto.75.1706200516514; Thu, 25 Jan 2024 08:35:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706200516; cv=none; d=google.com; s=arc-20160816; b=A8F6Fub5zkmFm7J6B301Eu1+U8eZkk85dh65vEOjr2bbhqnocUuGmEpZ16rcPyAMlK ZbRHS+fa+EY7LBw0FnIwtwdYvkrCafpwXe2E1H8zrFjz4J7sBq+01O0CKfn7wQ33MbNi mvRrJeO5zT43rAHNFFEiwCVGKuo22m4L/O4HdDkw8CTMPPL5JZqvx0oCGiw1xOWU5alz VBSTXCl3RcxhWbZDYxwmG/aVwuYLe723CJ9SGqEc3WgsuJnFLB2MVADzzQRzex+r45fE t8JUsD0Bj/xZSG8bAlPLoLqYkXf7UAcTLy2CWfqtZRc+B5jNNOFo8oI/ReDzpWp1Gvo5 SuDg== 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=5VAtlyKekgyrpcRxglyNDTk+EfBtmZT3jre+RwjFb84=; fh=kcov7vl7xxOd84pcsL/vu8Npa8ekHQuOCdhbB2+Xkxw=; b=oazpEhUgJmc4D7v9EfmoGcYDdWbCqH0M8VliaW2XaQl6C/tcbbHmt21ZqJvfkpYoK1 0/6pQjI0nulC9t0UlgfwXg8BD81NGXQ6aPboIRiKb4g3h25bcstT9bAq9ZxG/WnHROvh dQiuKsWdVAcYiGRSza++jzIrsjbp7skVcBYGan+nhgO2hgCedlSdztGINA2R3WuhoPuh eLO/iVyqrg12WeVr5O5gxqea8SLeQGhP8GOPHxmU9lCoFkQjhupOVCgWki+PuzDsSDXT W+RRKdUBwUsHmvgL7gh7/X1Mh2SLK9hVgJWH//1I21SS7nT6KE1JQ8FH9JX805iTd61q TTKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="YfPmM/nc"; 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 h7-20020ac85847000000b0042a52afce6dsi5806821qth.55.2024.01.25.08.35.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Jan 2024 08:35:16 -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="YfPmM/nc"; 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 1rT2gF-0006ru-F2; Thu, 25 Jan 2024 11:34:19 -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 1rT2gD-0006qC-Ul for qemu-devel@nongnu.org; Thu, 25 Jan 2024 11:34:17 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rT2gA-000295-2P for qemu-devel@nongnu.org; Thu, 25 Jan 2024 11:34:17 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-40eb033c192so6090155e9.0 for ; Thu, 25 Jan 2024 08:34:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706200452; x=1706805252; 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=5VAtlyKekgyrpcRxglyNDTk+EfBtmZT3jre+RwjFb84=; b=YfPmM/ncBRWpFQQOQewrEalxrkMsI0TQYJuG4jH+kWNWimyywcnXMfOphxoWCtvgcr Gm/8OCJyTv2hUdwE5YiMnINMcS2S5UoFK6Dwsu5nUnecqMV7TiGB1OJc8om7cH9Ly25U ILwdy2UIG+Pjq2GLuhO/U1g/0vHsmPT4PP+0mTWBrRZBdYVoZgiUB5M6PBmYTFwctxhr S96ZUCgUzUJCVwxBcy76VqTDZVgALJqgKaHHIyYdqLH0NyAdpiTA3RX6hfVui5dIyBMz V5bkNnnUCMX02dJ7+yyKK+Bh9CwWdNYOcCeteg4ZtnZ5m02kjBZUWKs7RaYDa0wzikec 08YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706200452; x=1706805252; 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=5VAtlyKekgyrpcRxglyNDTk+EfBtmZT3jre+RwjFb84=; b=uZOvIaZqM3uhYXKsSSVoE2WgZ5jsADfXBRfA9JAFSUCQESemFRMzh5ic2bonwoSKWN Z6FAeMfHA6QRtPnKGlNEGI5/2UsRjicFoCl0ZrL7urRPBH80N+BWeHSsvED/5GWMKaMC yt+knnspBH2epSmkULuhqXhy6ZBs/Ll8LQ/avTwYFgwht3/nCqh4gAoUcDkqtSDV3YAq uBatAEk5xe9eyVTHpS5T3Lq5qZ7M+yh2M3YX19kPs16gY1VfqN14DN1VtTHzPJudHG7J 6TTLX6vByQJQCdUMJjFV34YtKy7+0Z8YGIz/DhRs0f272+qaW4la/hSsL0LQXxUilrHM nQbQ== X-Gm-Message-State: AOJu0Yza+/0E78mW9g5DaxrHt9FLyFLL4tohgp/sFiPQLjkVlf5uhWa2 kgWOkziyXe8IminPYZSbwrlbbwECA0wIYIlqtjZUV+k70i1CACrCkzRBMISdXkvjDnJnIJnev0x V X-Received: by 2002:a05:600c:1d90:b0:40e:c635:331 with SMTP id p16-20020a05600c1d9000b0040ec6350331mr42474wms.53.1706200452627; Thu, 25 Jan 2024 08:34:12 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id p13-20020a05600c358d00b0040ea875a527sm3122208wmq.26.2024.01.25.08.34.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 08:34:12 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org Subject: [PATCH 07/10] include: Clean up includes Date: Thu, 25 Jan 2024 16:34:05 +0000 Message-Id: <20240125163408.1595135-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240125163408.1595135-1-peter.maydell@linaro.org> References: <20240125163408.1595135-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32c.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=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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This commit was created with scripts/clean-includes: ./scripts/clean-includes --git include include/*/*.h include/*/*/*.h 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: Zhao Liu --- I hand-checked that all these headers are included only by .c files which already have osdep.h included. --- include/hw/arm/raspberrypi-fw-defs.h | 1 - include/hw/mem/memory-device.h | 1 - include/hw/ppc/spapr_nested.h | 1 - include/hw/xen/xen-hvm-common.h | 1 - include/qemu/qtree.h | 1 - include/ui/rect.h | 2 -- 6 files changed, 7 deletions(-) diff --git a/include/hw/arm/raspberrypi-fw-defs.h b/include/hw/arm/raspberrypi-fw-defs.h index 4551fe7450d..579cf0d5546 100644 --- a/include/hw/arm/raspberrypi-fw-defs.h +++ b/include/hw/arm/raspberrypi-fw-defs.h @@ -10,7 +10,6 @@ #ifndef INCLUDE_HW_MISC_RASPBERRYPI_FW_DEFS_H_ #define INCLUDE_HW_MISC_RASPBERRYPI_FW_DEFS_H_ -#include "qemu/osdep.h" enum rpi_firmware_property_tag { RPI_FWREQ_PROPERTY_END = 0, diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h index a1d62cc551a..e0571c8a319 100644 --- a/include/hw/mem/memory-device.h +++ b/include/hw/mem/memory-device.h @@ -14,7 +14,6 @@ #define MEMORY_DEVICE_H #include "hw/qdev-core.h" -#include "qemu/typedefs.h" #include "qapi/qapi-types-machine.h" #include "qom/object.h" diff --git a/include/hw/ppc/spapr_nested.h b/include/hw/ppc/spapr_nested.h index d3834864764..d312a5d61da 100644 --- a/include/hw/ppc/spapr_nested.h +++ b/include/hw/ppc/spapr_nested.h @@ -1,7 +1,6 @@ #ifndef HW_SPAPR_NESTED_H #define HW_SPAPR_NESTED_H -#include "qemu/osdep.h" #include "target/ppc/cpu.h" /* diff --git a/include/hw/xen/xen-hvm-common.h b/include/hw/xen/xen-hvm-common.h index 4e9904f1a65..4b1d728f35c 100644 --- a/include/hw/xen/xen-hvm-common.h +++ b/include/hw/xen/xen-hvm-common.h @@ -1,7 +1,6 @@ #ifndef HW_XEN_HVM_COMMON_H #define HW_XEN_HVM_COMMON_H -#include "qemu/osdep.h" #include "qemu/units.h" #include "cpu.h" diff --git a/include/qemu/qtree.h b/include/qemu/qtree.h index 69fe74b50d0..dc2b14d2582 100644 --- a/include/qemu/qtree.h +++ b/include/qemu/qtree.h @@ -42,7 +42,6 @@ #ifndef QEMU_QTREE_H #define QEMU_QTREE_H -#include "qemu/osdep.h" #ifdef HAVE_GLIB_WITH_SLICE_ALLOCATOR diff --git a/include/ui/rect.h b/include/ui/rect.h index 68f05d78a8e..7ebf47ebcdc 100644 --- a/include/ui/rect.h +++ b/include/ui/rect.h @@ -4,8 +4,6 @@ #ifndef QEMU_RECT_H #define QEMU_RECT_H -#include -#include typedef struct QemuRect { int16_t x; From patchwork Thu Jan 25 16:34:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 765956 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1007:b0:337:62d3:c6d5 with SMTP id a7csp47228wrx; Thu, 25 Jan 2024 08:36:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IGa8PGCI8tQRzlaUbdw+lS505BFOPIinP4CQQD0NEN48U3jlJmErL7b0Bkg3m49qhO2yx2w X-Received: by 2002:a05:6214:1c4a:b0:684:dc67:4834 with SMTP id if10-20020a0562141c4a00b00684dc674834mr1402196qvb.98.1706200586059; Thu, 25 Jan 2024 08:36:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706200586; cv=none; d=google.com; s=arc-20160816; b=haJTcTmRaeoeWx6uYONxp7An/bv0uLiOSJlRLRrVdM3jkKvo0voP0ee5pkLuQkwA3H tio8yCjGlJXWSoAHZ1vGt0CEyar4NF1zFioZ14oSEl3CdRmYWJj7+1C9ZZQeS2z8cp6u ZI/9nKVWdH37Qc7JvGAAzjiT/w7qc4+pHVElVaDtXJe7aQgB7KUSa4ac8JlKUHTDZkA3 AvIV/YXRFXWOORZsBhZcdwfS/nJwl5duD6ZVNAcNbvvLCzAvOfttxiJQJVnx8vRTpbCb mR0kXFG12mJdXaCX1oQiBCSFv2/CPUXboSAd6srkUbuV8SFhMsaMImJ42FqJob6yYgvi L9EA== 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=blcIrf8+81pwYQa70vo1vxCRB41hnePR6PPCGf2tfqg=; fh=kcov7vl7xxOd84pcsL/vu8Npa8ekHQuOCdhbB2+Xkxw=; b=t/vSpobv5ZXaCE7O9H7I7q69XWN8k9366VTOisV7zwovYlaSb4mg/TAwDLQAzczoB5 7zenD8w44rhzjOJlt9FlUKTxqcJ+IUqwupCKxqHYRb3K5OtfJ6ZNFhqwW0iN/pekqkzl AP/1DihTtpSkEcPsJknYZ/7FGhTeyFSSf9/nc/OOX23EssKbJBOGKqIZSH6+t6TfkXRV HAZAuKjuwdwz6Wk2Rd4Cr9UR4Qf8IsN/TaGxm+bj9az9nWEkO2hUbM8l3/alhm3hyEYI 4S9XUcBMhLD2QxQ+mcCzNZfyqaCv+QFjzz0VcADzT0+Vd1lRvOGIu4YAlyLYkCFtDnhd CtNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VKQ0X4a3; 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 r19-20020a0ce293000000b0068197c63693si13177727qvl.184.2024.01.25.08.36.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Jan 2024 08:36:26 -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=VKQ0X4a3; 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 1rT2gG-0006tw-G3; Thu, 25 Jan 2024 11:34:20 -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 1rT2gE-0006qx-SZ for qemu-devel@nongnu.org; Thu, 25 Jan 2024 11:34:18 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rT2gA-00029m-OF for qemu-devel@nongnu.org; Thu, 25 Jan 2024 11:34:18 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-40ed4690ee4so3073675e9.2 for ; Thu, 25 Jan 2024 08:34:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706200453; x=1706805253; 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=blcIrf8+81pwYQa70vo1vxCRB41hnePR6PPCGf2tfqg=; b=VKQ0X4a3q6eQr51QR4ktfoK/MwBKAPj25ylOql2OmMovYeB2gJF8iIcU+Pjsvaro8D UaRUxKuzZdEygUmIpVChkjuZtj8fXZtybi6tHKzNpLDfJzl8Wk56VPeT+X03uwZJEGcI /HXDwDsmFKjVuHXsggGZjnVjD6qOokp1+FGq096ScrEneJmIZgMXxhuaWVqFNLbBR31z T6Gxdrxs76+WbEk4YlxyddDnSBDdaIOwLS64c/mneNDMds8XcHfLRq5KG1/K6twP/BdG HK4rumuuqRrFm3yVw3jIhSe2SJ3o0PAUilPdYvJiEYvxmxEuMjsC0z5ylS8J6/DDYYyt 6dsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706200453; x=1706805253; 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=blcIrf8+81pwYQa70vo1vxCRB41hnePR6PPCGf2tfqg=; b=fQiF6Co1rOs4vBJCGYOoJ9phaVM45W2pOXLRzCi9z/RwSy8TkSf1Sp8OSs2gN6CVjm iJRXKqVMMbJ3t6ucZheT5xB7NZuxYs9uypfvSNTAOyMhBu7dw0u5wJJruKCjCOOfHGy4 23Dpcz72LbeT9vu++wCavf4WP4J5V1sxozW9nmKoiLaxChm/bTq0Rx+3/srI/KOEdPnt asTzl4Jz2PpTP4QF9V0dGTFRsOETXFovgMMdhYKgjYOhTevoWhH4s3vtdYuQLYtYu3+w 5ftWB1wsrPLTOx+rOvvk/gmhqytQ9zGCJwinYuexnAvf/QWS9xz9s/vBef/sr32fhwgU qWUw== X-Gm-Message-State: AOJu0Yy8Ii016JRs1xHZTYZqqJ5S92IGp61bYl0HJJI40qhhduyBifta U7Y6hTCfmLYk96xecGnOgnN6nwaqEn3zliialQAdhnOnA9rkeeRd57/qzLh0Babw0M/reLb2krt K X-Received: by 2002:a05:600c:1d8d:b0:40e:d4d2:f00d with SMTP id p13-20020a05600c1d8d00b0040ed4d2f00dmr57837wms.130.1706200453065; Thu, 25 Jan 2024 08:34:13 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id p13-20020a05600c358d00b0040ea875a527sm3122208wmq.26.2024.01.25.08.34.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 08:34:12 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org Subject: [PATCH 08/10] cxl: Clean up includes Date: Thu, 25 Jan 2024 16:34:06 +0000 Message-Id: <20240125163408.1595135-9-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240125163408.1595135-1-peter.maydell@linaro.org> References: <20240125163408.1595135-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.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 This commit was created with scripts/clean-includes. 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: Philippe Mathieu-Daudé Reviewed-by: Zhao Liu Acked-by: Jonathan Cameron --- hw/cxl/cxl-events.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/cxl/cxl-events.c b/hw/cxl/cxl-events.c index bee6dfaf148..affcf8a34dd 100644 --- a/hw/cxl/cxl-events.c +++ b/hw/cxl/cxl-events.c @@ -7,11 +7,9 @@ * COPYING file in the top-level directory. */ -#include - #include "qemu/osdep.h" + #include "qemu/bswap.h" -#include "qemu/typedefs.h" #include "qemu/error-report.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" From patchwork Thu Jan 25 16:34:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 765954 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1007:b0:337:62d3:c6d5 with SMTP id a7csp47012wrx; Thu, 25 Jan 2024 08:35:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IExLuV9Io9ixF1PSD1ODlnb3vpcpldBd5IBlyGF0rsKYOV2ZSTW5ctWYRizTxVGVDRGRtJm X-Received: by 2002:a9d:6e1a:0:b0:6e1:75e:fddd with SMTP id e26-20020a9d6e1a000000b006e1075efdddmr77467otr.7.1706200559091; Thu, 25 Jan 2024 08:35:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706200559; cv=none; d=google.com; s=arc-20160816; b=F0e7csQrDu4X1kiKVI5Zb1RjN8YyXxDR28L2EvdyNaUdbvAS0fOhAUJeBhzCle9vOP QN3rwHckZHLEO48n2/8cVZvL6tAOdwt6bGjT4o9Bhq53SXBJiMrBj1wykDobHHd344uZ zz0UB2H5SxrzC0Xg6tHElyc+PrqrYYxcWfOhO+D1LPWYLCzBDm+qcPEfblVOwAgwCN+I vQySHrWijQh2L49WJxM2k4Bf4+SejUTl29jJjPQ/63vSWS+NCNLqK57NMmW6NYRmw9ye H1lQnk5Dk9j/7keWZMPD7EyjT4u99ULMzQqtmJ94aJtMXojln2RtkMC8zzeI1xNF1uJh R8MQ== 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=Q+eC4LHMBL/iVnWEGbnsMN/lqwJwozZWJpzQmLLpDa0=; fh=kcov7vl7xxOd84pcsL/vu8Npa8ekHQuOCdhbB2+Xkxw=; b=rTNxZn51ZEMUrmlJy+GjlWdGxTn3XhI2AcJKI08z5/xlfcGygJ4SCUFQ24OMIkGgJc WB97vjwcpOm8W4y61sTNb9pAdlxQcBAMlk8GL+6DaViukia7EDk2S0TwFFX7kFT+nvO4 kKwCLR5oGsBybSXvDFEZ+kiNwJPokg9ktyW8/BD9JKoNbOIjbWJKmZXZN2lRqqZWJHtI 4UQcH2INaI70pJm67Iu5pyvqBmMJ5Z7xYX7ilTS6+s1lqj8lQXDWtDpMbqtaAuB8w46O 22iAxJMOUkQytv0SSoE2VRtTX/XLX2NsOaD3dBoN1pQgCwCikgZZwIOU8Unuv76xpsUl on0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gZTPy9M8; 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 b5-20020ac84f05000000b004297b53b3a3si12196795qte.806.2024.01.25.08.35.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Jan 2024 08:35:59 -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=gZTPy9M8; 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 1rT2gH-0006uj-F3; Thu, 25 Jan 2024 11:34:21 -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 1rT2gF-0006r6-1Y for qemu-devel@nongnu.org; Thu, 25 Jan 2024 11:34:19 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rT2gB-0002AK-10 for qemu-devel@nongnu.org; Thu, 25 Jan 2024 11:34:18 -0500 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-33937dd1b43so3359945f8f.3 for ; Thu, 25 Jan 2024 08:34:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706200453; x=1706805253; 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=Q+eC4LHMBL/iVnWEGbnsMN/lqwJwozZWJpzQmLLpDa0=; b=gZTPy9M8DXpWBMJVATgRm04efqFyEE/FsBwtBdKklrr+Tr94m5Zca0TnRrNgIbXiCa iOhdZ+l4B7WN4RHmaCUT0bRaO3vaNyCzTckh6dEir4xSTFkNbHEN8GhVW9YJilawWH1i UGLNs9q7WPWbiAx+JYl7nuWVOKSJEL0MVdCNwk5m/gmyhdiHV0AKimFgskDm4CW0GhcJ SGM40qzwQezDNdETE1CY9TAAWQPBaQALbd2NeVp6UzvLOspnR9PcDu7huK5SjFYw35g9 cGrDHnsgaKWezFWcAow/FZ04PfCHpe0MU8Ky28r4nJJUfxHhY0bzcXXSnpRfxSG25UJc +G2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706200453; x=1706805253; 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=Q+eC4LHMBL/iVnWEGbnsMN/lqwJwozZWJpzQmLLpDa0=; b=HlHkSZGhswHl5dTu9ekgE6d5PHvVqRNomqARVGzrK0Tia4FZV9B5SeAHUz6WcBuLW5 xWzOSKWypV+1HDzX8OzPWimd5Eojydc441hTSix2BJi2PaO2CyTUGHcbha7nm2QCBik2 9tWI3LIbiIbf2K2aHPUkPSYUe08wrsvQlSs1IPtikQpQSH/F/rkzSjTTaphus6lKcvMF 6LXZPkgUSOGimmkyfYFtj8nCxlfKyw9x63QMIYbhWVIQx5mLRdbNitYxBXw4TXylVTP3 kW2mRmcFtHQ+FtytfzTk8ic4TAn786Qhu5F4TID4NMi+iJm6K3zyby1t2WhM1b0gYeLr HwGQ== X-Gm-Message-State: AOJu0YysZ8A036BBksPz64A7aGbZP3gORjYplG3aifRKGT/fouf/RaR/ i1FOFR/ccq4sJoZqd6VizvOZsf8zyos9U9hV2K1iwZlgaQ0zjpou43lm7FNcdK+gJggI8ZW03CK P X-Received: by 2002:a5d:6543:0:b0:339:502f:5e0c with SMTP id z3-20020a5d6543000000b00339502f5e0cmr1146669wrv.10.1706200453495; Thu, 25 Jan 2024 08:34:13 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id p13-20020a05600c358d00b0040ea875a527sm3122208wmq.26.2024.01.25.08.34.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 08:34:13 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org Subject: [PATCH 09/10] riscv: Clean up includes Date: Thu, 25 Jan 2024 16:34:07 +0000 Message-Id: <20240125163408.1595135-10-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240125163408.1595135-1-peter.maydell@linaro.org> References: <20240125163408.1595135-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42b.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=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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This commit was created with scripts/clean-includes: ./scripts/clean-includes --git riscv target/riscv/*.[ch] 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: Philippe Mathieu-Daudé Reviewed-by: Zhao Liu Reviewed-by: Alistair Francis --- target/riscv/vector_internals.h | 1 - target/riscv/vector_internals.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/target/riscv/vector_internals.h b/target/riscv/vector_internals.h index 8133111e5f6..842765f6c16 100644 --- a/target/riscv/vector_internals.h +++ b/target/riscv/vector_internals.h @@ -19,7 +19,6 @@ #ifndef TARGET_RISCV_VECTOR_INTERNALS_H #define TARGET_RISCV_VECTOR_INTERNALS_H -#include "qemu/osdep.h" #include "qemu/bitops.h" #include "cpu.h" #include "tcg/tcg-gvec-desc.h" diff --git a/target/riscv/vector_internals.c b/target/riscv/vector_internals.c index 9cf5c17cdea..12f5964fbbe 100644 --- a/target/riscv/vector_internals.c +++ b/target/riscv/vector_internals.c @@ -16,6 +16,7 @@ * this program. If not, see . */ +#include "qemu/osdep.h" #include "vector_internals.h" /* set agnostic elements to 1s */ From patchwork Thu Jan 25 16:34:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 765957 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1007:b0:337:62d3:c6d5 with SMTP id a7csp47234wrx; Thu, 25 Jan 2024 08:36:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IFunXFjl6lMQwJ8M9wb56Be9lB7ckJY5J812K+BeGWcYEjT5rxyeDf5kPWvDsC98Yifnxgv X-Received: by 2002:a05:620a:b06:b0:783:6c7e:721 with SMTP id t6-20020a05620a0b0600b007836c7e0721mr1359303qkg.123.1706200586457; Thu, 25 Jan 2024 08:36:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706200586; cv=none; d=google.com; s=arc-20160816; b=KkwWQumKjWnqyuJiXuWzU1bpvtpfEj+gtX3TPIPLlq7Spx2NjOMif7zqFo25iBI0ne 3EzTc9IFimk8XO7awz7fO8Vj6Uwz+xBqRjnuhaE/KSGkIzeGlmXFpzJjFm6WN8Mjl7Mi FP5E6JYj4aw+O1aBqvPHL9jtwnki/UIZrNPwog+vo3/GBFPjDO9khzdJzMlex1bVJOIn cknBC8IDrCFI4GqAGGbWGOecVU+sikwU2wGAmfJ+6w7nxvCdLQ0kzD5y0RjipJ8AgZu3 Sw3F3wamzvfKW+D5IFj5jpUJ+vPUlv0TjVakJPmMvGaVxwK0FE3XSGcLrh9zEwsL3fS0 5k4Q== 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=3B7RIYSQBA2EJV4QrqnnX0R7U4YmJKg5KsLLI0ApV2U=; fh=kcov7vl7xxOd84pcsL/vu8Npa8ekHQuOCdhbB2+Xkxw=; b=02FaiLzaa0TczqXDIsXYylb6ihS52xgd1BJiGfwLgw510KU9TR+CeyK6pvB13wJvsb sGThHywjUbwKP5rH5nVAXJ+ZhYAkNMJVyWv568iPtTCJQSNtIMMuQi6kPKUnqTXPh8zD gdJ2NOj1kylX/lVSKdLLZpoSS+TZINqkM6ZJdUISwQ7DxP93sYHXTIFJ2tl1dD4twm0G N5iQf4wJTGzxnUVwJSmd2ThYmbpy1K2aMcO3vv5XcKgwqvBQJbNzKZZ6wcZCgbS0v7ou XgXiubZ3goWFX5ndNZXRFaqOlzDi2h3PsZaa+tBLTypwHLLoPBF0n0pfN1N7dK/539Hl FrzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=T2rxg3vk; 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 b12-20020a05620a118c00b0078323154d3csi12693790qkk.440.2024.01.25.08.36.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Jan 2024 08:36:26 -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=T2rxg3vk; 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 1rT2gG-0006tp-GK; Thu, 25 Jan 2024 11:34:20 -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 1rT2gF-0006rq-9y for qemu-devel@nongnu.org; Thu, 25 Jan 2024 11:34:19 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rT2gB-0002Ai-Ai for qemu-devel@nongnu.org; Thu, 25 Jan 2024 11:34:19 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-40e913e3f03so87223285e9.3 for ; Thu, 25 Jan 2024 08:34:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706200454; x=1706805254; 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=3B7RIYSQBA2EJV4QrqnnX0R7U4YmJKg5KsLLI0ApV2U=; b=T2rxg3vkySHMQvphLG/I4yaLExBBr5fNmE7/rVutu47xdMZguAVEbSLUEGu++efIoI RBS6Fdkj3Tlmc/El8IMLrqCpXw1bL1JScnweShUV668uCiX0tq/OtjHhnifE1kCQMJJh BIjUypzLzy9bASl9heFIy7OPsVH2TvDA/Td8Lk10yJt0DY2YszNnK3yM/6XBuU0y+LDn 3+j/jocbfLh4T3SR+3aa1PcyEwxMCv3q0/pp4FLQW+yHLfkXeo/xjBCCzvWhMm43C7t1 irBPOCj42nPtEqCNMtZ/rXQyzrteYpwhWyxWYtdc+S4IjBGGb9hYgd7WliyziDY6upe/ wArQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706200454; x=1706805254; 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=3B7RIYSQBA2EJV4QrqnnX0R7U4YmJKg5KsLLI0ApV2U=; b=lXiwNS2LUTzVseIi65faOGI4sKXFGcTe5PQ6oZXaiP40DZus6sEgQCXAryxpbNoxId QS+v25ZXEp+x6BA6/GsfcX15rxPM6F2+aC/C1F7bHDG/ph1a8c3qvzcIw6uv1bWPcU/V WDWKlRy949CqO/ASrC5kSVNqYyHDoDox3IMSzDsjdzSUUmC1Q+lD5/c7FeJ9PuFB5mj1 DMjmoOXHCy6KvZ4a4Qhv/pWXRi8kmW0jceKgTnIeWOwjIlTLdcsfl7c/nGlD1y4vYo9g TTJ/xMlcQkIbePo08vHl8PvVaPUWZEe4S4e4r/WwEr2cPy10LcKf7p5UdsVyWCLSOMF+ xv2g== X-Gm-Message-State: AOJu0Yyrr1gVQzipXu1YQnIfQIvWPwNsG+xsaXpXF6l1adTW2ITad219 4sXNKIZvXLUdy/bcjTqaUKofwpTl3zPz10itkkrDBduwzOJZOAmkNov/MTsGzR0xSZSz3v8PtaW 3 X-Received: by 2002:a05:600c:4f54:b0:40e:a0fc:6435 with SMTP id m20-20020a05600c4f5400b0040ea0fc6435mr687987wmq.116.1706200453923; Thu, 25 Jan 2024 08:34:13 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id p13-20020a05600c358d00b0040ea875a527sm3122208wmq.26.2024.01.25.08.34.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 08:34:13 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org Subject: [PATCH 10/10] misc: Clean up includes Date: Thu, 25 Jan 2024 16:34:08 +0000 Message-Id: <20240125163408.1595135-11-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240125163408.1595135-1-peter.maydell@linaro.org> References: <20240125163408.1595135-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x334.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=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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This commit was created with scripts/clean-includes: ./scripts/clean-includes --git misc net/af-xdp.c plugins/*.c audio/pwaudio.c util/userfaultfd.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: Zhao Liu --- These are all cases where files include things osdep already gives them. --- audio/pwaudio.c | 1 - net/af-xdp.c | 1 - plugins/core.c | 1 - plugins/loader.c | 1 - util/userfaultfd.c | 1 - 5 files changed, 5 deletions(-) diff --git a/audio/pwaudio.c b/audio/pwaudio.c index 3ce5f6507b4..3b14e04fbb0 100644 --- a/audio/pwaudio.c +++ b/audio/pwaudio.c @@ -11,7 +11,6 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "audio.h" -#include #include "qemu/error-report.h" #include "qapi/error.h" #include diff --git a/net/af-xdp.c b/net/af-xdp.c index 6c65028fb00..38e600703a3 100644 --- a/net/af-xdp.c +++ b/net/af-xdp.c @@ -13,7 +13,6 @@ #include "qemu/osdep.h" #include -#include #include #include #include diff --git a/plugins/core.c b/plugins/core.c index 49588285dd0..ee2fa41af9e 100644 --- a/plugins/core.c +++ b/plugins/core.c @@ -27,7 +27,6 @@ #include "tcg/tcg.h" #include "tcg/tcg-op.h" #include "plugin.h" -#include "qemu/compiler.h" struct qemu_plugin_cb { struct qemu_plugin_ctx *ctx; diff --git a/plugins/loader.c b/plugins/loader.c index 734c11cae04..9768b78eb6b 100644 --- a/plugins/loader.c +++ b/plugins/loader.c @@ -33,7 +33,6 @@ #ifndef CONFIG_USER_ONLY #include "hw/boards.h" #endif -#include "qemu/compiler.h" #include "plugin.h" diff --git a/util/userfaultfd.c b/util/userfaultfd.c index fdff4867e8b..1b2fa949d4d 100644 --- a/util/userfaultfd.c +++ b/util/userfaultfd.c @@ -18,7 +18,6 @@ #include #include #include -#include typedef enum { UFFD_UNINITIALIZED = 0,