| Message ID | 20240125163408.1595135-11-peter.maydell@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Clean up includes | expand |
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 > >
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,
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(-)