From patchwork Wed Jan 31 11:55:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 768491 Delivered-To: patch@linaro.org Received: by 2002:adf:ee41:0:b0:33a:e5bd:fedd with SMTP id w1csp1819715wro; Wed, 31 Jan 2024 04:01:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IEOgn4Oo+HiGRqxtyKSXfkCtaao8/uFF5ysOydQSwfJ0uksbL+Ads5mEJGNy5PueSzBSqVB X-Received: by 2002:a05:6102:3674:b0:46b:528:d5e1 with SMTP id bg20-20020a056102367400b0046b0528d5e1mr718179vsb.8.1706702473378; Wed, 31 Jan 2024 04:01:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706702473; cv=none; d=google.com; s=arc-20160816; b=lUXaNtZnTjieDOGFLESyNXXSNq/Edvpx668wDHnlzMvGIuFl5kx7Cp0psB0nruLnW3 EPsyRsKZQIsZt+JRYNeOBKLgCXV5SArv6cZ1Go64P3+BnFl0wPqY3UkyXmaFAt6AW/su SHG8JDE/VDvQJylzJxVPwheIp8ZAr8r3At6puuPvY3pscd9JJd6UF4nofO+qYk4eA/Qg dwKLqQ4fuQYmAjH8aYSpLOnb997Xe6N6oUBZsqB3Ykkuo0URqtQ4Ek+TPa3dGmAy0ZVq P4aUN6Qu9f81mbCDDGYAN28RKdZASdG6RxZ/4+EuEJGlR1a2cUvpH9521nrCICs6xnOl 3gZg== 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; bh=rGvy3JsZWF00heMqBOuKcZXSor/Jdqbt5xvJ6Gsknq8=; fh=22WrOULeZIQvyQtlH6lyAlnM/R0rBR6GbTy5o9eXFIg=; b=DDdaog4v1P4EYjRfVSJbmDHHuJ2mq5uXIDpEgk2ieE4LQzLscYp939kJ1Fi7m/Qo5D 0kEMUHxxvJeQTMztgUcFkxHbLDUvfDr11pn03a17DLu54Toa1mIbLd12RHAiNM2myRZT iZJYEM4i/QLYIO6tIwpiX0r0psyYbPZvJ8IEinsnEmtwYDUzuzX8ch+SrSnXRUquOKLZ Qd9Mk+U55S6fAr74AzO7W6xR5T5lNcMo4pvICCM7i/2vW0LxCzBausDBZXNK+UATsKnl Ef034961SQT9m0Kkrc0S+a9RieasvjDIssC47PCJao7+NRrA+5bOlmIa388Q/Xwm+827 eNEQ==; darn=linaro.org ARC-Authentication-Results: i=1; mx.google.com; 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" X-Forwarded-Encrypted: i=0; AJvYcCVxyMGX1RDcD2/4Q/FHJrtk39WEmefh0r9EJ4wF+Ejiy6QnuEOAdxZmu4CrIu9sTdcrXtYXslcD5Vs/qo61Raql Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id de21-20020a056102561500b0046b3f94ff73si1028589vsb.360.2024.01.31.04.01.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 31 Jan 2024 04:01:13 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rV9Ch-0000fc-0x; Wed, 31 Jan 2024 06:56:31 -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 1rV9CX-0000Kf-Nc; Wed, 31 Jan 2024 06:56:23 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rV9CV-0003yA-Dj; Wed, 31 Jan 2024 06:56:20 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 7D80F490CA; Wed, 31 Jan 2024 14:56:47 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id B43FB70273; Wed, 31 Jan 2024 14:55:50 +0300 (MSK) Received: (nullmailer pid 2263948 invoked by uid 1000); Wed, 31 Jan 2024 11:55:49 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 12/21] include: Clean up includes Date: Wed, 31 Jan 2024 14:55:40 +0300 Message-Id: <20240131115549.2263854-13-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240131115549.2263854-1-mjt@tls.msk.ru> References: <20240131115549.2263854-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, 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 From: Peter Maydell 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 Signed-off-by: Michael Tokarev --- 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 4551fe7450..579cf0d554 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 a1d62cc551..e0571c8a31 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 d383486476..d312a5d61d 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 4e9904f1a6..4b1d728f35 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 69fe74b50d..dc2b14d258 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 68f05d78a8..7ebf47ebcd 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;