[v1] Clean up includes

[PATCH 10/10] misc: Clean up includes

Peter Maydell posted 10 patches 10 months ago

Diff against v1 v1 v1 v2 v3 v4 v5 v6
Download mbox

Maintainers: Gerd Hoffmann <kraxel@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Christoph Muellner <christoph.muellner@vrull.eu>, LIU Zhiwei <zhiwei_liu@linux.alibaba.com>, Philipp Tomsich <philipp.tomsich@vrull.eu>, Palmer Dabbelt <palmer@dabbelt.com>, Alistair Francis <Alistair.Francis@wdc.com>, "Cédric Le Goater" <clg@kaod.org>, Peter Maydell <peter.maydell@linaro.org>, Andrew Jeffery <andrew@codeconstruct.com.au>, Joel Stanley <joel@jms.id.au>, Jonathan Cameron <jonathan.cameron@huawei.com>, Fan Ni <fan.ni@samsung.com>, "Maciej S. Szmigiero" <maciej.szmigiero@oracle.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, "Michael S. Tsirkin" <mst@redhat.com>, Laurent Vivier <laurent@vivier.eu>, David Hildenbrand <david@redhat.com>, Igor Mammedov <imammedo@redhat.com>, Xiao Guangrong <xiaoguangrong.eric@gmail.com>, Nicholas Piggin <npiggin@gmail.com>, Daniel Henrique Barboza <danielhb413@gmail.com>, David Gibson <david@gibson.dropbear.id.au>, Harsh Prateek Bora <harshpb@linux.ibm.com>, Stefano Stabellini <sstabellini@kernel.org>, Anthony Perard <anthony.perard@citrix.com>, Paul Durrant <paul@xen.org>, Ilya Maximets <i.maximets@ovn.org>, Jason Wang <jasowang@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, Alexandre Iooss <erdnaxe@crans.org>, Mahmoud Mandour <ma.mandourr@gmail.com>, Bin Meng <bin.meng@windriver.com>, Weiwei Li <liwei1518@gmail.com>, Thomas Huth <thuth@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>

There is a newer version of this series

Expand all Fold all

[PATCH 10/10] misc: Clean up includes

Posted by Peter Maydell 10 months ago

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 <peter.maydell@linaro.org>
---
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 <errno.h>
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include <spa/param/audio/format-utils.h>
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 <bpf/bpf.h>
-#include <inttypes.h>
 #include <linux/if_link.h>
 #include <linux/if_xdp.h>
 #include <net/if.h>
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 <poll.h>
 #include <sys/syscall.h>
 #include <sys/ioctl.h>
-#include <fcntl.h>
 
 typedef enum {
     UFFD_UNINITIALIZED = 0,
-- 
2.34.1

Re: [PATCH 10/10] misc: Clean up includes

Posted by Zhao Liu 10 months ago

On Thu, Jan 25, 2024 at 04:34:08PM +0000, Peter Maydell wrote:
> Date: Thu, 25 Jan 2024 16:34:08 +0000
> From: Peter Maydell <peter.maydell@linaro.org>
> Subject: [PATCH 10/10] misc: Clean up includes
> X-Mailer: git-send-email 2.34.1
> 
> 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 <peter.maydell@linaro.org>
> ---
> 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(-)

Reviewed-by: Zhao Liu <zhao1.liu@intel.com>

> 
> 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 <errno.h>
>  #include "qemu/error-report.h"
>  #include "qapi/error.h"
>  #include <spa/param/audio/format-utils.h>
> 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 <bpf/bpf.h>
> -#include <inttypes.h>
>  #include <linux/if_link.h>
>  #include <linux/if_xdp.h>
>  #include <net/if.h>
> 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 <poll.h>
>  #include <sys/syscall.h>
>  #include <sys/ioctl.h>
> -#include <fcntl.h>
>  
>  typedef enum {
>      UFFD_UNINITIALIZED = 0,
> -- 
> 2.34.1
> 
>