From nobody Sat Feb 7 07:41:13 2026 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=1768568351; cv=none; d=zohomail.com; s=zohoarc; b=IpZOoZb0qMFskiK+1qxUHG69Pqy/68fQUjkm6OimRx6GiO/7XQFiEUcnCGH4QBEk1nGhnIlR49V8qqPGBfxfn4yKaJJDlIahFKtJXFRcGWgkD+pWo3Q7lygPzKFWZIQ0HsEZxcfvmTzCnyHliri1YHMlhzRFopGyj1gzco9DqQ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768568351; 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=AOsYTkHMDWaZJQZPkrAXk9jzTOl3OFsQkdgtD7kLcAY=; b=d027iY3jmAdY61vuqYp7XuHdAKHAyu0yZvgM0vENR9BzDAsvloucCZDhk8BUGkBdcIZf2iTVTPRK5Bqh7jA/Rt28tr6mqSeNEBgNL8hs0CAaiun6SRR7i4RoEeXiuCI8nMaKmj2gietXuxC+GZr4zwrDmyRa815MO+6zxOHYoaE= 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 1768568351961987.8811297341432; Fri, 16 Jan 2026 04:59:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vgjPh-0003hz-7o; Fri, 16 Jan 2026 07:58: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 1vgjPS-0003eh-2d for qemu-devel@nongnu.org; Fri, 16 Jan 2026 07:58:38 -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 1vgjPP-00009o-Ss for qemu-devel@nongnu.org; Fri, 16 Jan 2026 07:58:37 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-47d59da3d81so13264955e9.0 for ; Fri, 16 Jan 2026 04:58:35 -0800 (PST) Received: from mnementh.archaic.org.uk (f.7.f.1.7.5.e.f.f.f.c.5.d.8.2.4.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0:0:428d:5cff:fe57:1f7f]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4801fe67780sm15387565e9.16.2026.01.16.04.58.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jan 2026 04:58:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1768568314; x=1769173114; 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=AOsYTkHMDWaZJQZPkrAXk9jzTOl3OFsQkdgtD7kLcAY=; b=Argoz/zn4ZDyh6i2nvmE89Hq49QOg5SbG2wWpS3trnJd9+P1mcme4df7ShlgVBDYar r3/RxJpiJbhq6TmKgAFgNnyyaTtrt7cdyxtihQOsqMuPP/lf83cwHPw2akrphAfGBlII 0IIWsSFUdEc60G91FJgBwPm+tpLfZXUCj++opPMRQ8038itetgpd9D3ZJ+tYvU3M2tA2 UGFE3TxsSD8fIiJb2mtrct9kQJdBt8MXvvI8TTioLZ/zdDRSxFmxwWk4QhOq0LAHpm9v cgsjpI3H2/MKhi63QZWSqpQShm9w4RQeSJFObzGfNtP3NNUZUr1BJjWmMhTwyNVd2+zR iJRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768568314; x=1769173114; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=AOsYTkHMDWaZJQZPkrAXk9jzTOl3OFsQkdgtD7kLcAY=; b=M00oA1s5IZt6vCiUUmp82YsWWXROy1GDKZOVEjvXuc/nanO9jwjT1AwYC07FZTlepv tKSyk7b1S/KwicYWDhzQXtfW3qQ5G1YxL7XtQoJv0sthU2R0NDS3maADm42sfcb+TJbA KnnRIScdZ8wB0opdq/LT860t59ZAbeS2Y9SlgwJz0BcvpVmpQu3D71+rycS7kthyFEYE vdN9trihnpq/MjfW0qWKE5WnK9t+bh3p9UPWth0JZXPvnOk2d9WrloT42NlPX+SI4uwb T/vviW1vX5gfIxk3GQ2CaBdM8/oo0Z1k7krWqBSGX2Ojp8BVYS+m+SGz1RXVDDGLLCcp GVQA== X-Gm-Message-State: AOJu0Ywv0YVrNeIN51jYm2B578FfXNC6vUCrXmLegpr3cfTMc2Yd5Xt1 ovIS/M02bE2wKbd3T7PcQYpyRfeP+3CtkR1CwD4jekkilVO1vGk0XQmjzJcLodN+OSoRHko7BlE NxddR X-Gm-Gg: AY/fxX602NPbt/6tD/E96Mxr+IUMZxO6xr57Yhxr0lpUjC4sk0xftAi+uCLa2XcY4/D D5/B8HMPlmPSi8PnKJLV86ou8IPe5svFdnrIprCIE+Z/q8jx0Cv8cjAbpxSKghny4nSaI9v28J2 p3IgqOKqP6zmXeZfJfOYrbuH+HbHAZBx9WQszQze7Bka8vhv/mn6RMVtDoIobqXqFAgJ2KBBaVS it+D2U71xaJf96OT8ShYYWEsQyZ+hStqUwWqcPulNINl3j0k+7d9VwkpnEFqz1ew16xZuVe2GGP W7sjWAvlr2J1t5jL4KJGhT0Gf82AfqYLn0NcVvFlXYJh50qwqv8rrCDE9AGkzBzCbIqPdtIJ7LR VTyrwdbSisxOQM33r8KqXwJnGRtnqaBVFcfqr1bdPEpOn+ipH+IBGH+qnQ6LA6t65L/dy5p3wX6 /VV+qGMkiFTfB8fCYhyxCNPRwlstH5UtDgQjlX401KJQQ5RohRrFIibRpmsHn9wrJbjn3zx8RrF 1p8pgQ98BCIiNFN4MfTjlOmmlnn8rrxFIAHMsqBeakd/A== X-Received: by 2002:a05:600c:8b6c:b0:46e:2815:8568 with SMTP id 5b1f17b1804b1-4801e66fcc5mr31827705e9.10.1768568313587; Fri, 16 Jan 2026 04:58:33 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Magnus Kulke , Wei Liu , Warner Losh , Kyle Evans , Richard Henderson , Helge Deller , Michael Roth , Kostiantyn Kostiuk , Marcelo Tosatti Subject: [PATCH 1/4] mshv: Clean up includes Date: Fri, 16 Jan 2026 12:58:27 +0000 Message-ID: <20260116125830.926296-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260116125830.926296-1-peter.maydell@linaro.org> References: <20260116125830.926296-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 (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::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 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: qemu development 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: 1768568353244158500 Content-Type: text/plain; charset="utf-8" This commit was created with scripts/clean-includes: ./scripts/clean-includes '--git' 'mshv' 'accel/mshv' 'target/i386/mshv' 'i= nclude/system/mshv.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=C3=A9 --- accel/mshv/irq.c | 3 +-- accel/mshv/mshv-all.c | 1 - include/system/mshv.h | 1 - target/i386/mshv/mshv-cpu.c | 1 - target/i386/mshv/x86.c | 1 - 5 files changed, 1 insertion(+), 6 deletions(-) diff --git a/accel/mshv/irq.c b/accel/mshv/irq.c index adf8f337d9..3c238c33c3 100644 --- a/accel/mshv/irq.c +++ b/accel/mshv/irq.c @@ -10,8 +10,8 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ =20 -#include "linux/mshv.h" #include "qemu/osdep.h" +#include "linux/mshv.h" #include "qemu/error-report.h" #include "hw/hyperv/hvhdk_mini.h" #include "hw/hyperv/hvgdk_mini.h" @@ -20,7 +20,6 @@ #include "system/mshv.h" #include "system/mshv_int.h" #include "trace.h" -#include #include =20 #define MSHV_IRQFD_RESAMPLE_FLAG (1 << MSHV_IRQFD_BIT_RESAMPLE) diff --git a/accel/mshv/mshv-all.c b/accel/mshv/mshv-all.c index 4675cb886f..bed0fa298e 100644 --- a/accel/mshv/mshv-all.c +++ b/accel/mshv/mshv-all.c @@ -41,7 +41,6 @@ #include "system/reset.h" #include "trace.h" #include -#include #include =20 #define TYPE_MSHV_ACCEL ACCEL_CLASS_NAME("mshv") diff --git a/include/system/mshv.h b/include/system/mshv.h index 8b1fc20c80..75286baf16 100644 --- a/include/system/mshv.h +++ b/include/system/mshv.h @@ -14,7 +14,6 @@ #ifndef QEMU_MSHV_H #define QEMU_MSHV_H =20 -#include "qemu/osdep.h" #include "qemu/accel.h" #include "hw/hyperv/hyperv-proto.h" #include "hw/hyperv/hvhdk.h" diff --git a/target/i386/mshv/mshv-cpu.c b/target/i386/mshv/mshv-cpu.c index 1c3db02188..586383b882 100644 --- a/target/i386/mshv/mshv-cpu.c +++ b/target/i386/mshv/mshv-cpu.c @@ -13,7 +13,6 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" #include "qemu/memalign.h" -#include "qemu/typedefs.h" =20 #include "system/mshv.h" #include "system/mshv_int.h" diff --git a/target/i386/mshv/x86.c b/target/i386/mshv/x86.c index d574b3bc52..0700cc05ef 100644 --- a/target/i386/mshv/x86.c +++ b/target/i386/mshv/x86.c @@ -13,7 +13,6 @@ #include "cpu.h" #include "emulate/x86_decode.h" #include "emulate/x86_emu.h" -#include "qemu/typedefs.h" #include "qemu/error-report.h" #include "system/mshv.h" =20 --=20 2.47.3 From nobody Sat Feb 7 07:41:13 2026 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=1768568394; cv=none; d=zohomail.com; s=zohoarc; b=MUgizAC95qWYCUCxcMVW9JL2JhiLdnsimviXZABak6+0CjnfRUWSAL1qdXetg50ZowFyzBpGL06xFAVpllLMkPV48lwsUyGqyFKJdXw4x3xTYQPHzydeVOei4+8sAIAka+WjRZDDrNI/a1tzmN5maoIyHstPJDpQ+lQUNJxdEcE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768568394; 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=xxtWiPsN7Mi5aHJwrd0JDklGWH67zod3CgRiIov2LTE=; b=OmDLyE2fC88q77AWq9TDoCiUWnWjdl8wuCQGy6CZpFp6d3PuwWC5Ej+1xSyofwNG+4u0SSVVpPsgFFB5FMRzZyCvgY0XFom6jrc4EALnef3cbML97oq8YEO4XbXGl2Mmkubm8K4ZqjRieGz0bSvFw22iYAPRzCMRbfFUU51zkZs= 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 176856839441896.95076413254208; Fri, 16 Jan 2026 04:59:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vgjPp-0003jn-PN; Fri, 16 Jan 2026 07:59: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 1vgjPS-0003ei-5y for qemu-devel@nongnu.org; Fri, 16 Jan 2026 07:58:38 -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 1vgjPQ-00009s-68 for qemu-devel@nongnu.org; Fri, 16 Jan 2026 07:58:37 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4801d1daf53so10857925e9.2 for ; Fri, 16 Jan 2026 04:58:35 -0800 (PST) Received: from mnementh.archaic.org.uk (f.7.f.1.7.5.e.f.f.f.c.5.d.8.2.4.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0:0:428d:5cff:fe57:1f7f]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4801fe67780sm15387565e9.16.2026.01.16.04.58.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jan 2026 04:58:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1768568315; x=1769173115; 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=xxtWiPsN7Mi5aHJwrd0JDklGWH67zod3CgRiIov2LTE=; b=EqEXQKIdRhRssBywlR+8rt8vcW0cvXidahDIp+2/muvGfz68CsML0ZnaCVIDqQkm84 gRanJUa2mjg/HHgGjMnXz+9n5z/3K26p1k2aGqI+sIICwJvDYALwkCruG7Jp5fEAeieM 5g4hMmYWPZxpOIWdLSGjrEqspb5xjAR4K4heqaZfeDuMe5w14tysa4pza7PxD4ZJqRdy OFm4E5BQZFxltUzLSn38E4fp/QgRi6EhxYSFMdDqUbU1zSrMb85izzuUkEgVGXS/pz6t p/2A5zEFsdHVeiFOIS/6HYbmgnjSQR5D+ep2XDUsnTn6AgRc7/SAvIj/sL015Kp8t6TB 4nMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768568315; x=1769173115; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=xxtWiPsN7Mi5aHJwrd0JDklGWH67zod3CgRiIov2LTE=; b=X8dvsi8dJKPB6rA8XTZw5hJ/fhn2Xwi4AbnFywm9Wb9/7cOULInGWlbcVdsH4+jtCD mpwcgy2485HFlt1l0+ytkn079yUJyUSNr/WNZw9sj8gpeF7dwkjp0EYfeo20IpUUeXdi aj2yKPLQ4uWcPlTXi9og13QFfO/HAooNudKlVI9bHyteBmXcXJPUxg3vyjb+k3jVJhor SvUgwwNdsKkKXg1mahU3EfmnKLzBJThVgYWYPrjUO3ktVR3pr36Hx/elZ68deHqwVpYo CZsZICUCrBui6V7cWU9gF2nQhz+XFMjKGB8UR1aiMEMr2S9XSiWmd/FeX6X5v+E/2rO5 WVSQ== X-Gm-Message-State: AOJu0YzS4+fwYVtH8gPc6tFGYhfL10+3OtGhcPK0Wh+sDfgwQeJMcAK0 gY9HQJ4KkAi5vRg6aQnjHWKp4qj+KBWUXe3SF1zm9wQq2vUQOfDSRpWsc2df8PegC78e/R+w3re v7eUp X-Gm-Gg: AY/fxX6tGJuZQ1NOKVRfPeL1nmnWmAIeXrLxpG8ZehCbIA+4XpwYsFkL02Wx51/MHDP pYOAzq1/IflSorHF6aXW8RzQDXYAh7ht/j1W9h0491cxJWByK2NEiSaskxQfzjB2KMDq2w/hVrE bK0vDxASaiMq9OTdY1bQk5ofsWtHq0s6kwhse79I4KtDXiavhl3SVK/2LY6WLnO0rg7p13TC3WW R8Z8l/wVjShQAAwFWYp51juik4h9Y8jNoGQ/FjROsmDXVo4afXWaX5IT6zj4mMCiVT9LPiNgHGy yw59b2qUY4TNs48WoVMZxNdcDcZ1od7xNp6P/86iCcYD52wmWfU2J/6BeunClKKsN+VYWKRO6xx Kt5dXiicOTBhsepBSuDtEEYa2B4ab58y+UB6/eSkP6YHH2oJeh8KNNVfKASGgncelEXKeYAIPr0 0Pj8AnFQQxZjA0UakjFiXOgCrYtYQ00ZxHYWwtcwMHTTJySYKxnN67VTcw0pvm/VCak1NLroVW/ angF7ZYYq0P78LfTo9k/FubyBnqb2JgUFotUzGC0sTidHyxSIZxIap2 X-Received: by 2002:a05:600c:6990:b0:47e:c562:a41f with SMTP id 5b1f17b1804b1-4801e334361mr35901095e9.18.1768568314641; Fri, 16 Jan 2026 04:58:34 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Magnus Kulke , Wei Liu , Warner Losh , Kyle Evans , Richard Henderson , Helge Deller , Michael Roth , Kostiantyn Kostiuk , Marcelo Tosatti Subject: [PATCH 2/4] bsd-user: Clean up includes Date: Fri, 16 Jan 2026 12:58:28 +0000 Message-ID: <20260116125830.926296-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260116125830.926296-1-peter.maydell@linaro.org> References: <20260116125830.926296-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 (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: qemu development 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: 1768568395622158502 Content-Type: text/plain; charset="utf-8" This commit was created with scripts/clean-includes: ./scripts/clean-includes '--git' 'bsd-user' 'bsd-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: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Warner Losh --- bsd-user/bsd-mem.h | 3 --- bsd-user/bsd-proc.c | 1 - bsd-user/freebsd/os-proc.h | 2 -- bsd-user/qemu-bsd.h | 1 - 4 files changed, 7 deletions(-) diff --git a/bsd-user/bsd-mem.h b/bsd-user/bsd-mem.h index 416d0f8c23..a118e57260 100644 --- a/bsd-user/bsd-mem.h +++ b/bsd-user/bsd-mem.h @@ -49,11 +49,8 @@ #ifndef BSD_USER_BSD_MEM_H #define BSD_USER_BSD_MEM_H =20 -#include #include -#include #include -#include =20 #include "qemu-bsd.h" #include "exec/mmap-lock.h" diff --git a/bsd-user/bsd-proc.c b/bsd-user/bsd-proc.c index ca3c1bf94f..8dcac9608d 100644 --- a/bsd-user/bsd-proc.c +++ b/bsd-user/bsd-proc.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" =20 #include -#include #include #include #include diff --git a/bsd-user/freebsd/os-proc.h b/bsd-user/freebsd/os-proc.h index 3003c8cb63..cc53215138 100644 --- a/bsd-user/freebsd/os-proc.h +++ b/bsd-user/freebsd/os-proc.h @@ -23,10 +23,8 @@ #include #include #include -#include #include #include -#include =20 #include "target_arch_cpu.h" =20 diff --git a/bsd-user/qemu-bsd.h b/bsd-user/qemu-bsd.h index ffc64bb244..56affcd31d 100644 --- a/bsd-user/qemu-bsd.h +++ b/bsd-user/qemu-bsd.h @@ -20,7 +20,6 @@ #ifndef QEMU_BSD_H #define QEMU_BSD_H =20 -#include #include #include #include --=20 2.47.3 From nobody Sat Feb 7 07:41:13 2026 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=1768568385; cv=none; d=zohomail.com; s=zohoarc; b=EN4Kv3+LQ79QWpBemZkRksRUfv3WjMeFTGoLmjoNQmkVe399QTH9yhhpoqkP3Qx3t044sYoQwcjHDmPzoSM9JvWTtjZWZGC4a27o3+Mar/acejOfXjvNGWXjR/IFnwnH/K+nS73lRqAnGZiJgIBwqgZIZxACCVys/V1qUXHSFNM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768568385; 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=BPhwWhZ7coRvcHGO4gjyXrn9e//3gG9lVCn8wwawJZQ=; b=eU9gbyN2kr831mgvLhqkXm/W0MTD3QfDhpRCiHIZrpHv+ypBr/16wDkILbnHNVzI2pz0W87ktZfqot7eqKPtP+cxmhXjKTXRHYP7rpRO3UfTYeN9ojIMFc/kzQ8VzbeYp5r9G3frumW78rP22tvp/uUs40Fl/nqe3+TtPCvPnNY= 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 1768568385435397.00993025252217; Fri, 16 Jan 2026 04:59:45 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vgjPn-0003ie-O6; Fri, 16 Jan 2026 07:59: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 1vgjPU-0003fS-7I for qemu-devel@nongnu.org; Fri, 16 Jan 2026 07:58:40 -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 1vgjPR-0000A4-AZ for qemu-devel@nongnu.org; Fri, 16 Jan 2026 07:58:39 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4801c2fae63so10315935e9.2 for ; Fri, 16 Jan 2026 04:58:36 -0800 (PST) Received: from mnementh.archaic.org.uk (f.7.f.1.7.5.e.f.f.f.c.5.d.8.2.4.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0:0:428d:5cff:fe57:1f7f]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4801fe67780sm15387565e9.16.2026.01.16.04.58.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jan 2026 04:58:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1768568316; x=1769173116; 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=BPhwWhZ7coRvcHGO4gjyXrn9e//3gG9lVCn8wwawJZQ=; b=PJMnAsBG3F6tQQNQzE9Ml6dIpm2r6yVZdTcvDJ9KcZa1SmEr2xr0reGpbFb7hF91+0 JQ6/DfvdI+LGdFiq5oG+r3eScSLp81ZUTnZGffbY8WqtWGwzQpGdK0hbY4sRHpCmPEAg eVW02LcyF2BSbaiytNveFk1J86YAPhNdnFupfxCPBr74weDEXciXs9eFIRHtqtYjg6Kh Or1qPRFItOqFnu6VI+dAENf5HRBnu9GOJ4K4V6l3r3tS/RjeELxlZNrIRF6jIAsZn1Qj 2v2ckGcS4VGK9Qg8ID9hcOYNyl5V4fNPt5vMD0C4QX17cBoQ+NatOZK8FUKwMRzNK1eO hAEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768568316; x=1769173116; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=BPhwWhZ7coRvcHGO4gjyXrn9e//3gG9lVCn8wwawJZQ=; b=dyeRRjN87b8hx5D10I8ephRcG+kCx97g9x90Y7SLsOEVjxbbwt3HKKEuss9VXnicqW IZQa77Wly1bRJlMyDaInlgIsmahmSNbyku/yno9Olc67Leos4kQMwUjPzGodedUgK+Ui 4yAL5g8SJvnXaGF8khjI1oOwwJYpLh4R9v6Kze2nQXU/hNHbaXRXYtq4pUYzSn7oJplO Qirt2cFItRfBFBI4Z7f08/c8IaeJ/M+2B/HKPglPDD/nBE8Ymq/Xn1jkgYgdu5F74JOW Q9LgwqEpMeVbQKOUBvzL6GFHvps1tU1GsjXeI1dVHO7zCteuvhplsGAUNzdR1lHk2xVC C5KA== X-Gm-Message-State: AOJu0YwDzRSXhOFUxrD/3mQiZJWPDetEF5ofUmNO2g2Gs804R1B4+H+B hSiMqrbEfEPwYP3RKCetFLPHc9TfelxNuXTqSCSaA4PgNdpE8wbEWts5FZQC6zxT16nS0M5Cbsv L6THR X-Gm-Gg: AY/fxX53dickmCN/QorANMRpCQRSga70wbgEUeeJagfjuIZhBRb0ZAYC48B2mUnKoFm +UAdo6zKtp2GVBmKEKPbZb64Cw4375V2OvUC7TaaXa1505jRYD7291X8z7EjvDxYdVCUUXuTMFC 0FHKQMryK8spfeJx0R4YJNJSoNdH3egWiYAQTo7wWiQdULWkqjH95N/vPBGWnE+MBABxCwBzdQ5 v9uepguuFW/BKCdbUMkmK1tujLhdhtTpgc/A8FyaSxRZ8qmi/sw3omiidINhjPBmJ5nazROuZRS KchQEfEVThZc4Bcv8t5FkvdVGoQc6aNwMnC0ROaJAfFuU14DUAfblrX+1Ru56NfBekf6yYRM/Bo ycOEYDCed5UvmTKP7hzFr3Ebu2I2nb8lqRdZB80FjaBXXVNfIGsF5MdV93j5bM76yeG8gtuuTMZ HIM3fEgXe3V6G83c/OJh92UPbLlQkaEj3MnhQMhJjksM7PkwRQ9Dn1OhAe1BdvdSnnBfzM9rCPs qSttVaWVQyjuDH3uNeeKjc4L1Av05AQA2AG/PPvOmUeEA== X-Received: by 2002:a05:600c:820e:b0:477:6d96:b3c8 with SMTP id 5b1f17b1804b1-480259d35d7mr2472925e9.23.1768568315685; Fri, 16 Jan 2026 04:58:35 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Magnus Kulke , Wei Liu , Warner Losh , Kyle Evans , Richard Henderson , Helge Deller , Michael Roth , Kostiantyn Kostiuk , Marcelo Tosatti Subject: [PATCH 3/4] misc: Clean up includes Date: Fri, 16 Jan 2026 12:58:29 +0000 Message-ID: <20260116125830.926296-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260116125830.926296-1-peter.maydell@linaro.org> References: <20260116125830.926296-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 (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: qemu development 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: 1768568387897158500 Content-Type: text/plain; charset="utf-8" This commit deals with various .c files that included system headers that are already pulled in by osdep.h, where the .c file includes osdep.h already itself. This commit was created with scripts/clean-includes: ./scripts/clean-includes '--git' 'misc' 'hw/core' 'semihosting' 'target/ar= m' 'target/i386/kvm/kvm.c' 'target/loongarch' 'target/riscv' 'tools' 'util' 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: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/core/machine-qmp-cmds.c | 1 - semihosting/arm-compat-semi-stub.c | 1 - target/arm/cpu32-stubs.c | 1 - target/i386/kvm/kvm.c | 1 - target/loongarch/csr.c | 1 - target/riscv/csr.c | 1 - tools/i386/qemu-vmsr-helper.c | 1 - util/cpuinfo-aarch64.c | 1 - 8 files changed, 8 deletions(-) diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index 79cbcdd63e..e62cb4ec88 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -30,7 +30,6 @@ #include "system/runstate.h" #include "system/system.h" #include "hw/s390x/storage-keys.h" -#include =20 /* * QMP query for enabled and present accelerators diff --git a/semihosting/arm-compat-semi-stub.c b/semihosting/arm-compat-se= mi-stub.c index bfa3681e26..40199c9842 100644 --- a/semihosting/arm-compat-semi-stub.c +++ b/semihosting/arm-compat-semi-stub.c @@ -6,7 +6,6 @@ =20 #include "qemu/osdep.h" #include "semihosting/semihost.h" -#include =20 bool semihosting_arm_compatible(void) { diff --git a/target/arm/cpu32-stubs.c b/target/arm/cpu32-stubs.c index f0ce159572..9e50bb1b0b 100644 --- a/target/arm/cpu32-stubs.c +++ b/target/arm/cpu32-stubs.c @@ -3,7 +3,6 @@ #include "qemu/osdep.h" #include "target/arm/cpu.h" #include "target/arm/internals.h" -#include =20 void arm_cpu_sme_finalize(ARMCPU *cpu, Error **errp) { diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 7b9b740a8e..0c940d4b64 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -21,7 +21,6 @@ #include #include #include -#include =20 #include #include diff --git a/target/loongarch/csr.c b/target/loongarch/csr.c index 332a1396cc..fff2312f87 100644 --- a/target/loongarch/csr.c +++ b/target/loongarch/csr.c @@ -2,7 +2,6 @@ /* * Copyright (c) 2025 Loongson Technology Corporation Limited */ -#include #include "qemu/osdep.h" #include "cpu.h" #include "csr.h" diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 05c7ec8352..5064483917 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -31,7 +31,6 @@ #include "qapi/error.h" #include "tcg/insn-start-words.h" #include "internals.h" -#include =20 /* CSR function table public API */ void riscv_get_csr_ops(int csrno, riscv_csr_operations *ops) diff --git a/tools/i386/qemu-vmsr-helper.c b/tools/i386/qemu-vmsr-helper.c index 6c0f4fe870..f12fd3c3e8 100644 --- a/tools/i386/qemu-vmsr-helper.c +++ b/tools/i386/qemu-vmsr-helper.c @@ -20,7 +20,6 @@ =20 #include "qemu/osdep.h" #include -#include #include #ifdef CONFIG_LIBCAP_NG #include diff --git a/util/cpuinfo-aarch64.c b/util/cpuinfo-aarch64.c index 57468890c3..288074c08f 100644 --- a/util/cpuinfo-aarch64.c +++ b/util/cpuinfo-aarch64.c @@ -26,7 +26,6 @@ #if defined(__OpenBSD__) && !defined(CONFIG_ELF_AUX_INFO) # include # include -# include # include #endif =20 --=20 2.47.3 From nobody Sat Feb 7 07:41:13 2026 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=1768568352; cv=none; d=zohomail.com; s=zohoarc; b=C5Nd5b1tLT7uaruNm25XRWbs4VDLo6ofrn++HOgUuI4gTqqYBS9UHbNZhqzos6mPinoyuXQ7Ds4itcTUVurNpe87mtSJ0kpKIUUQn7IstLNZuuE7AOc7rWeTCpIm/nf2ldSIDef09ND/8Qj8WyEf9xLI3/hJKz88wdc4GUGi8jw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768568352; 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=h+RqHQeniNxEgx1KoTf/hdjWw4joxNDfaDyoWRJZKuw=; b=Nox6/A20rVpln83heFayOard++ZsrYqxChAkBcand+wO+cwmKb7nZRRwWqq95ZUzSQZBeyCfsDklo64OULpfR/5w6BILbxxXc1OSt3sKffQiIxTwehDpING2+OCz5wKC2Dz1Fef3DQ+vR19p2xjD2jlBdmmKy2uxw0H8sJPVE0Q= 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 1768568352258866.9947217753889; Fri, 16 Jan 2026 04:59:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vgjPh-0003i0-8Q; Fri, 16 Jan 2026 07:58: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 1vgjPV-0003fj-ON for qemu-devel@nongnu.org; Fri, 16 Jan 2026 07:58:41 -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 1vgjPU-0000AM-04 for qemu-devel@nongnu.org; Fri, 16 Jan 2026 07:58:41 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-47ee3da7447so11849955e9.0 for ; Fri, 16 Jan 2026 04:58:38 -0800 (PST) Received: from mnementh.archaic.org.uk (f.7.f.1.7.5.e.f.f.f.c.5.d.8.2.4.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0:0:428d:5cff:fe57:1f7f]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4801fe67780sm15387565e9.16.2026.01.16.04.58.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jan 2026 04:58:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1768568317; x=1769173117; 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=h+RqHQeniNxEgx1KoTf/hdjWw4joxNDfaDyoWRJZKuw=; b=blX0J7kusfGAaXNhI6HW7qmsNN/Wyq8Pp3rOQRBVZ2lE7PBkdHNOx5U7UWkCc8H9cW YxeWNFZpyAeC9Gch5Itqs3wD5z0DcHRWKbGeDaFXZ0FenEjQF4i69PHd8k9CbXJjPWW2 ghuspBXYTBIIuw4Mh9w4GzkM817is/0du8erIGUZnUncovY6jfaVhPzpD35/lXINkJax 2DH6BNQdSIZ1Hshkbsu1UCMmcFz87xAPyazFcIP3xrJgRTbCWANNlPeeBb+IX0FTw4PR CsGoFOOPAsRqJpfVLfPb3YHdzvNGkuufsECSokspMmgD4pj6i5+1C0KKTw4P9rdO1UxV 7gCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768568317; x=1769173117; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=h+RqHQeniNxEgx1KoTf/hdjWw4joxNDfaDyoWRJZKuw=; b=iRQFWJYSyByoCn1BNw8YLZyyuOzlaoaZ0AQYqxULuGIGCyYMvv2nltLayjQOCOy/Tg x541LGJ5TiHCk+gCjY/EEWyf5DNVx++y1rrLOdLExrJWIjYyMmuo60eADGuT0jO9QbSp V2jMIwU6i0AAULM0ZlSH4EqKZJRU63ofIzP+qEV9IQo2CZui2OVu62VvICdGpblSORLE hNcEQ69uhBVuviHUYI3L+SoTFKT4BeUDHf++wMkH7+uY6jDRvLSiaLyXrX9kq7dQ7p21 fv5xYNP561mXycon86RqjgIHc4S0mNJfIx39UliT5SPJEI6UzE4R4xwf8wpkDvi4n1Da brtA== X-Gm-Message-State: AOJu0Yyk5dUTTzimIKQ4gP+cJ34geEznnffAvc2vhPu+7R+eNZuXQrTW 16wkSivSWWFCOwiKAkHxGZh8bDC248tzmOLpxz1eWS5UkGT7BqK8KiQ7PbeO9LaQ5r5oKEOIAwQ S5xub X-Gm-Gg: AY/fxX4qhUN1V/jtVYw2DyTPYYElhitgMOVQX0O88asnGC6XJSSymuBGU6NNi1BscjE b+2YYsRy3QWxnXcjY8UwufDQBrKJ5Q+q6avMb7AMpre52AajNCk1n26EVMbcHE1eg+v8o6filSy 1Yq0/SxrjwtGYVQoQ0pG2J8WwQMCRrrjrWFsi2RWlS8xay03nL9yqf0iEoTsdVhS8sPudp4lJm8 uNdINDLrX5Awr04DriPUMnqOmYhS56oCQvwMnpmhiJCKCnlvAXzm+i9yRtWMV7TXGjXtCqBSrzN zU+tp1+fyhnV2uoshrvxFJPb3Aqued/DdvbVj1+SLr/OAyDRAleu7tVAFrQghMsqKGpsbCxvTZ1 xx75S08J7QJM30cx2MAMFtylEJAoUaN0d7K6qNY5TJNJ2UOrYjK/KorYskRkNunclbjzksxx0Mn onbCPQ3Tv5pdshG/ynJgCFj+5j28xez789kPMpdAadp5ImpzHEB3FWYtakN8nyBgwK8isKYz6Zw a0UFDoYo64UQcxGJVBxS6UxwMHlOUIKxiSL6cD1iaIArA== X-Received: by 2002:a05:600c:4e43:b0:477:c71:1fc1 with SMTP id 5b1f17b1804b1-4801e3342eemr35605065e9.19.1768568316715; Fri, 16 Jan 2026 04:58:36 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Magnus Kulke , Wei Liu , Warner Losh , Kyle Evans , Richard Henderson , Helge Deller , Michael Roth , Kostiantyn Kostiuk , Marcelo Tosatti Subject: [PATCH 4/4] all: Clean up includes Date: Fri, 16 Jan 2026 12:58:30 +0000 Message-ID: <20260116125830.926296-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260116125830.926296-1-peter.maydell@linaro.org> References: <20260116125830.926296-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 (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: qemu development 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: 1768568353316158500 Content-Type: text/plain; charset="utf-8" This commit was created with scripts/clean-includes: ./scripts/clean-includes '--git' 'all' '--all' and manually edited to remove one change to hw/virtio/cbor-helpers.c. All these changes are header files that include osdep.h or some system header that osdep.h pulls in; they don't need to do this. 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=C3=A9 --- hw/scsi/lasi_ncr710.h | 1 - hw/scsi/ncr53c710.h | 1 - include/hw/core/loader.h | 1 - include/hw/i386/tdvf.h | 1 - include/hw/ppc/spapr_fadump.h | 1 - include/hw/riscv/iommu.h | 1 - include/system/accel-irq.h | 1 - linux-user/alpha/target_proc.h | 1 - qga/commands-windows-ssh.h | 1 - qga/vss-win32/vss-debug.h | 1 - target/i386/kvm/vmsr_energy.h | 2 -- 11 files changed, 12 deletions(-) diff --git a/hw/scsi/lasi_ncr710.h b/hw/scsi/lasi_ncr710.h index 99be001fc3..450fb7e1c3 100644 --- a/hw/scsi/lasi_ncr710.h +++ b/hw/scsi/lasi_ncr710.h @@ -15,7 +15,6 @@ #define HW_LASI_NCR710_H =20 #include "hw/core/sysbus.h" -#include "qemu/osdep.h" #include "exec/memattrs.h" #include "hw/scsi/scsi.h" #include "hw/scsi/ncr53c710.h" diff --git a/hw/scsi/ncr53c710.h b/hw/scsi/ncr53c710.h index a8dc92f4ef..00b6a01577 100644 --- a/hw/scsi/ncr53c710.h +++ b/hw/scsi/ncr53c710.h @@ -15,7 +15,6 @@ #ifndef HW_NCR53C710_H #define HW_NCR53C710_H =20 -#include "qemu/osdep.h" #include "hw/core/sysbus.h" #include "hw/scsi/scsi.h" #include "qemu/fifo8.h" diff --git a/include/hw/core/loader.h b/include/hw/core/loader.h index 6f91703503..4abd55a64b 100644 --- a/include/hw/core/loader.h +++ b/include/hw/core/loader.h @@ -1,7 +1,6 @@ #ifndef LOADER_H #define LOADER_H #include "hw/nvram/fw_cfg.h" -#include "qemu/typedefs.h" =20 /* loader.c */ /** diff --git a/include/hw/i386/tdvf.h b/include/hw/i386/tdvf.h index e75c8d1acc..4d7362ad65 100644 --- a/include/hw/i386/tdvf.h +++ b/include/hw/i386/tdvf.h @@ -9,7 +9,6 @@ #ifndef HW_I386_TDVF_H #define HW_I386_TDVF_H =20 -#include "qemu/osdep.h" =20 #define TDVF_SECTION_TYPE_BFV 0 #define TDVF_SECTION_TYPE_CFV 1 diff --git a/include/hw/ppc/spapr_fadump.h b/include/hw/ppc/spapr_fadump.h index fde2830e94..82681fb9a6 100644 --- a/include/hw/ppc/spapr_fadump.h +++ b/include/hw/ppc/spapr_fadump.h @@ -6,7 +6,6 @@ #ifndef PPC_SPAPR_FADUMP_H #define PPC_SPAPR_FADUMP_H =20 -#include "qemu/osdep.h" #include "cpu.h" =20 /* Fadump commands */ diff --git a/include/hw/riscv/iommu.h b/include/hw/riscv/iommu.h index 25f1a8b159..999384fc89 100644 --- a/include/hw/riscv/iommu.h +++ b/include/hw/riscv/iommu.h @@ -19,7 +19,6 @@ #ifndef HW_RISCV_IOMMU_H #define HW_RISCV_IOMMU_H =20 -#include "qemu/osdep.h" #include "qom/object.h" =20 #define TYPE_RISCV_IOMMU "riscv-iommu" diff --git a/include/system/accel-irq.h b/include/system/accel-irq.h index 671fb7dfdb..a2caa06f54 100644 --- a/include/system/accel-irq.h +++ b/include/system/accel-irq.h @@ -12,7 +12,6 @@ #ifndef SYSTEM_ACCEL_IRQ_H #define SYSTEM_ACCEL_IRQ_H #include "hw/pci/msi.h" -#include "qemu/osdep.h" #include "system/kvm.h" #include "system/mshv.h" =20 diff --git a/linux-user/alpha/target_proc.h b/linux-user/alpha/target_proc.h index 6b491ffa3a..71949d380d 100644 --- a/linux-user/alpha/target_proc.h +++ b/linux-user/alpha/target_proc.h @@ -6,7 +6,6 @@ #ifndef ALPHA_TARGET_PROC_H #define ALPHA_TARGET_PROC_H =20 -#include "qemu/osdep.h" #include "target/alpha/cpu.h" =20 static uint8_t alpha_phys_addr_space_bits(CPUAlphaState *env) diff --git a/qga/commands-windows-ssh.h b/qga/commands-windows-ssh.h index 40ac67c4d9..c35d945a89 100644 --- a/qga/commands-windows-ssh.h +++ b/qga/commands-windows-ssh.h @@ -11,7 +11,6 @@ */ =20 #include -#include typedef struct WindowsUserInfo { char *sshDirectory; char *authorizedKeyFile; diff --git a/qga/vss-win32/vss-debug.h b/qga/vss-win32/vss-debug.h index 7800457392..506cee6698 100644 --- a/qga/vss-win32/vss-debug.h +++ b/qga/vss-win32/vss-debug.h @@ -10,7 +10,6 @@ * See the COPYING file in the top-level directory. */ =20 -#include "qemu/osdep.h" #include =20 #ifndef VSS_DEBUG_H diff --git a/target/i386/kvm/vmsr_energy.h b/target/i386/kvm/vmsr_energy.h index 151bcbd642..415d64f51c 100644 --- a/target/i386/kvm/vmsr_energy.h +++ b/target/i386/kvm/vmsr_energy.h @@ -14,8 +14,6 @@ #ifndef VMSR_ENERGY_H #define VMSR_ENERGY_H =20 -#include -#include "qemu/osdep.h" #include "io/channel-socket.h" #include "hw/i386/topology.h" =20 --=20 2.47.3