From patchwork Wed Jan 31 11:55:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 768483 Delivered-To: patch@linaro.org Received: by 2002:adf:ee41:0:b0:33a:e5bd:fedd with SMTP id w1csp1818702wro; Wed, 31 Jan 2024 03:58:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IFOdnEH/MwVV5X1mrIWQ7Wc7ECh1acCFbGesxzlB9oxIyRxA81PlkeGVsm7cdiwwcN9ZjHl X-Received: by 2002:ac8:7dcf:0:b0:42a:b059:ec4a with SMTP id c15-20020ac87dcf000000b0042ab059ec4amr1419451qte.3.1706702335230; Wed, 31 Jan 2024 03:58:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706702335; cv=none; d=google.com; s=arc-20160816; b=tzUXD6jY4HvB8VkRb+3hy7iLj2qx4i0BawBIPv+B0i7+2Cz5lYZXLKMfUFKyqhA+bE iWpd6els7tag6jdXTlpVCeyvBErneZ4UROZJgD+YJJR7vcEecp4IPwG9SseWZ/sTQibp mnKFi8vFX9S+qUIAiGhL8nC6WkEGqQhh57vbZvK3Th3/oswjf0Z79kkiui/DJOEyA7Nt nz1e8y9f1GKGirANQ733BwWaqrjotG2SaiiQ8HIe5DQ88bi6HOp7do2bDJcCONRHi7zw yVcnyUpFvYkb6cdQiFgYuM/QxoycO04Jf1vEeE02OgtvNQek0p1Av/aZRUeB5FEk6ryj NLVw== 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=gyTdwJHQ0/32zn7WrE8HQ6UmY0pS8HJRMA98S6Sp36A=; fh=4Ik8Gssd/TXG3HW5H46wi5inRpsHW/61HKNJB0tlZLI=; b=nE3nNQ6TUwmYbv7IbrBNsLqI5ZZf1VvKvBAdmj4lKBXSqaKytdcclZ3eeEJ5zH62gT Ss/oNZzsWun0qZomksCDna7mQ5Oq0svjPJ7FELUyoj3HnxTm92qw5077eBOlG4gdjxFL iQORjIcqAePSHAkSuVD/Eo90zFQDcU3cJTwlDqo5BVUXFFWYP4Qih/AKElyTTfBTPYoK gkz7pCgVzcf46QEpxtapWgJ6juOidh/aj995Mu/cMlsUPfK2IspSBK6J6tdAgV0e5G0G re+YbOd9aLo6XT6OJfqYrySHDytQnXj49aDFt1AMXgJMTFDJa9Ep4idvok9WBXOhNaoF O4+g==; 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; AJvYcCX535wq//ON8fqv3dbAQpr612HAxOehslLZBt7kldR9NHmsHHHo4Vtng0a4Ffg7su28vhJo2om+kWqq2G07IdoX Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y5-20020a05622a004500b0042ab643b76bsi3544349qtw.147.2024.01.31.03.58.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 31 Jan 2024 03:58:55 -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 1rV9Cv-0001ET-Kr; Wed, 31 Jan 2024 06:56:45 -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 1rV9Ct-0001Cj-Qo; Wed, 31 Jan 2024 06:56:43 -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 1rV9Cs-00041E-9J; Wed, 31 Jan 2024 06:56:43 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id A9D9E490CD; 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 DFCB170276; Wed, 31 Jan 2024 14:55:50 +0300 (MSK) Received: (nullmailer pid 2263957 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 15/21] misc: Clean up includes Date: Wed, 31 Jan 2024 14:55:43 +0300 Message-Id: <20240131115549.2263854-16-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 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 Signed-off-by: Michael Tokarev --- 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 3ce5f6507b..3b14e04fbb 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 6c65028fb0..38e600703a 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 49588285dd..ee2fa41af9 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 734c11cae0..9768b78eb6 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 fdff4867e8..1b2fa949d4 100644 --- a/util/userfaultfd.c +++ b/util/userfaultfd.c @@ -18,7 +18,6 @@ #include #include #include -#include typedef enum { UFFD_UNINITIALIZED = 0,