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;