Clean up includes
PATCH 1/1 Clean up includes
Clean up includes so that osdep.h is included first and headers which it implies are not included manually.
This commit was created with scripts/clean-includes, with the changes to the following files manually reverted:
contrib/libvhost-user/libvhost-user-glib.h
contrib/libvhost-user/libvhost-user.c
contrib/libvhost-user/libvhost-user.h
contrib/plugins/hotblocks.c
contrib/plugins/hotpages.c
contrib/plugins/howvec.c
contrib/plugins/lockstep.c
linux-user/mips64/cpu_loop.c
linux-user/mips64/signal.c
linux-user/sparc64/cpu_loop.c
linux-user/sparc64/signal.c
linux-user/x86_64/cpu_loop.c
linux-user/x86_64/signal.c
target/s390x/gen-features.c
tests/fp/platform.h
tests/migration/s390x/a-b-bios.c
tests/plugin/bb.c
tests/plugin/empty.c
tests/plugin/insn.c
tests/plugin/mem.c
tests/test-rcu-simpleq.c
tests/test-rcu-slist.c
tests/test-rcu-tailq.c
tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.ccontrib/plugins/, tests/plugin/, and tests/test-rcu-slist.c appear not to include osdep.h intentionally. The remaining reverts are the same as in commit bbfff19688d.
---
No real need to get this into 5.2 at this stage. No real risk either.
contrib/vhost-user-gpu/vugbm.h | 2 -- contrib/vhost-user-gpu/vugpu.h | 1 - include/hw/block/swim.h | 1 - include/hw/display/macfb.h | 1 - include/qemu/nvdimm-utils.h | 1 - tests/qtest/fuzz/fuzz.h | 1 - tests/qtest/fuzz/generic_fuzz_configs.h | 1 - tools/virtiofsd/fuse_common.h | 2 -- tools/virtiofsd/fuse_log.h | 1 - tools/virtiofsd/fuse_lowlevel.h | 3 --- tools/virtiofsd/fuse_misc.h | 1 - tools/virtiofsd/passthrough_seccomp.h | 1 - contrib/vhost-user-gpu/virgl.c | 1 + contrib/vhost-user-gpu/vugbm.c | 1 + contrib/vhost-user-input/main.c | 1 - hw/display/artist.c | 1 - hw/s390x/s390-pci-vfio.c | 3 ++- tools/virtiofsd/buffer.c | 5 ----- tools/virtiofsd/fuse_log.c | 2 -- tools/virtiofsd/fuse_lowlevel.c | 10 ---------- tools/virtiofsd/fuse_opt.c | 4 ---- tools/virtiofsd/fuse_signals.c | 5 ----- tools/virtiofsd/fuse_virtio.c | 10 ---------- tools/virtiofsd/helper.c | 8 -------- tools/virtiofsd/passthrough_ll.c | 12 ------------ tools/virtiofsd/passthrough_seccomp.c | 3 --- util/nvdimm-utils.c | 1 + 27 files changed, 5 insertions(+), 78 deletions(-)
contrib/vhost-user-gpu/vugbm.h +0 -2
@@ -10,10 +10,8 @@#ifndef VHOST_USER_GPU_VUGBM_H #define VHOST_USER_GPU_VUGBM_H -#include "qemu/osdep.h" #ifdef CONFIG_MEMFD -#include <sys/mman.h> #include <sys/ioctl.h> #endif
contrib/vhost-user-gpu/vugpu.h +0 -1
@@ -15,7 +15,6 @@#ifndef VUGPU_H #define VUGPU_H -#include "qemu/osdep.h" #include "contrib/libvhost-user/libvhost-user-glib.h" #include "standard-headers/linux/virtio_gpu.h"
include/hw/block/swim.h +0 -1
@@ -11,7 +11,6 @@#ifndef SWIM_H #define SWIM_H -#include "qemu/osdep.h" #include "hw/sysbus.h" #include "qom/object.h"
include/hw/display/macfb.h +0 -1
@@ -13,7 +13,6 @@#ifndef MACFB_H #define MACFB_H -#include "qemu/osdep.h" #include "exec/memory.h" #include "ui/console.h" #include "qom/object.h"
include/qemu/nvdimm-utils.h +0 -1
@@ -1,7 +1,6 @@#ifndef NVDIMM_UTILS_H #define NVDIMM_UTILS_H -#include "qemu/osdep.h" GSList *nvdimm_get_device_list (void );#endif
tests/qtest/fuzz/fuzz.h +0 -1
@@ -14,7 +14,6 @@#ifndef FUZZER_H_ #define FUZZER_H_ -#include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h"
tests/qtest/fuzz/generic_fuzz_configs.h +0 -1
@@ -13,7 +13,6 @@ #ifndef GENERIC_FUZZ_CONFIGS_H #define GENERIC_FUZZ_CONFIGS_H -#include "qemu/osdep.h" typedef struct generic_fuzz_config { const char *name, *args, *objects;
tools/virtiofsd/fuse_common.h +0 -2
@@ -18,8 +18,6 @@#include "fuse_log.h" #include "fuse_opt.h" -#include <stdint.h> -#include <sys/types.h> /** Major version of FUSE library interface */ #define FUSE_MAJOR_VERSION 3
tools/virtiofsd/fuse_log.h +0 -1
@@ -14,7 +14,6 @@* This file defines the logging interface of FUSE */ -#include <stdarg.h> /** * Log severity level
tools/virtiofsd/fuse_lowlevel.h +0 -3
@@ -25,10 +25,7 @@#include "fuse_common.h" -#include <fcntl.h> -#include <sys/stat.h> #include <sys/statvfs.h> -#include <sys/types.h> #include <sys/uio.h> #include <utime.h>
tools/virtiofsd/fuse_misc.h +0 -1
@@ -7,7 +7,6 @@*/ #include <pthread.h> -#include "config-host.h" /* * Versioned symbols cannot be used in some cases because it
tools/virtiofsd/passthrough_seccomp.h +0 -1
@@ -9,7 +9,6 @@#ifndef VIRTIOFSD_SECCOMP_H #define VIRTIOFSD_SECCOMP_H -#include <stdbool.h> void setup_seccomp (bool enable_syslog);
contrib/vhost-user-gpu/virgl.c +1 -0
@@ -12,6 +12,7 @@* See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include <virglrenderer.h> #include "virgl.h"
contrib/vhost-user-gpu/vugbm.c +1 -0
@@ -7,6 +7,7 @@* See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "vugbm.h" static bool
contrib/vhost-user-input/main.c +0 -1
@@ -6,7 +6,6 @@#include "qemu/osdep.h" -#include <glib.h> #include <linux/input.h> #include "qemu/iov.h"
hw/display/artist.c +0 -1
@@ -9,7 +9,6 @@#include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/error-report.h" -#include "qemu/typedefs.h" #include "qemu/log.h" #include "qemu/module.h" #include "qemu/units.h"
hw/s390x/s390-pci-vfio.c +2 -1
@@ -9,11 +9,12 @@* directory. */ +#include "qemu/osdep.h" +#include <sys/ioctl.h> #include <linux/vfio.h> #include <linux/vfio_zdev.h> -#include "qemu/osdep.h" #include "trace.h" #include "hw/s390x/s390-pci-bus.h" #include "hw/s390x/s390-pci-clp.h"
tools/virtiofsd/buffer.c +0 -5
@@ -12,11 +12,6 @@#include "qemu/osdep.h" #include "fuse_i.h" #include "fuse_lowlevel.h" -#include <assert.h> -#include <errno.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> size_t fuse_buf_size (const struct fuse_bufvec *bufv) {
tools/virtiofsd/fuse_log.c +0 -2
@@ -11,8 +11,6 @@#include "qemu/osdep.h" #include "fuse_log.h" -#include <stdarg.h> -#include <stdio.h> static void default_log_func (__attribute__((unused))enum fuse_log_level level,const char *fmt,va_list ap)
tools/virtiofsd/fuse_lowlevel.c +0 -10
@@ -16,17 +16,7 @@#include "fuse_opt.h" #include "fuse_virtio.h" -#include <assert.h> -#include <errno.h> -#include <glib.h> -#include <limits.h> -#include <stdbool.h> -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/file.h> -#include <unistd.h> #define THREAD_POOL_SIZE 64
tools/virtiofsd/fuse_opt.c +0 -4
@@ -14,10 +14,6 @@#include "fuse_i.h" #include "fuse_misc.h" -#include <assert.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> struct fuse_opt_context {void *data;
tools/virtiofsd/fuse_signals.c +0 -5
@@ -12,11 +12,6 @@#include "fuse_i.h" #include "fuse_lowlevel.h" -#include <errno.h> -#include <signal.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> static struct fuse_session *fuse_instance;
tools/virtiofsd/fuse_virtio.c +0 -10
@@ -20,20 +20,10 @@#include "fuse_opt.h" #include "fuse_virtio.h" -#include <assert.h> -#include <errno.h> -#include <glib.h> -#include <stdint.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/eventfd.h> #include <sys/socket.h> -#include <sys/types.h> #include <sys/un.h> -#include <sys/types.h> #include <grp.h> -#include <unistd.h> #include "contrib/libvhost-user/libvhost-user.h"
tools/virtiofsd/helper.c +0 -8
@@ -16,16 +16,8 @@#include "fuse_misc.h" #include "fuse_opt.h" -#include <errno.h> -#include <limits.h> -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/param.h> -#include <sys/time.h> #include <sys/resource.h> -#include <unistd.h> #define FUSE_HELPER_OPT (t, p) \ { \
tools/virtiofsd/passthrough_ll.c +0 -12
@@ -41,29 +41,17 @@#include "fuse_log.h" #include "fuse_lowlevel.h" #include "standard-headers/linux/fuse.h" -#include <assert.h> #include <cap-ng.h> #include <dirent.h> -#include <errno.h> -#include <glib.h> -#include <inttypes.h> -#include <limits.h> #include <pthread.h> -#include <stdbool.h> -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/file.h> #include <sys/mount.h> #include <sys/prctl.h> #include <sys/resource.h> #include <sys/syscall.h> -#include <sys/types.h> #include <sys/wait.h> #include <sys/xattr.h> #include <syslog.h> -#include <unistd.h> #include "qemu/cutils.h" #include "passthrough_helpers.h"
tools/virtiofsd/passthrough_seccomp.c +0 -3
@@ -10,10 +10,7 @@#include "passthrough_seccomp.h" #include "fuse_i.h" #include "fuse_log.h" -#include <errno.h> -#include <glib.h> #include <seccomp.h> -#include <stdlib.h> /* Bodge for libseccomp 2.4.2 which broke ppoll */ #if !defined(__SNR_ppoll) && defined(__SNR_brk)
util/nvdimm-utils.c +1 -0
@@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include "qemu/nvdimm-utils.h" #include "hw/mem/nvdimm.h"
Signature · 1 line
2.26.2
Quoted 9 lines · Markus Armbruster
Clean up includes so that
osdep.his included first and headers which it implies are not included manually.This commit was created with
scripts/clean-includes, with the changes to the following files manually reverted:contrib/plugins/, tests/plugin/, and
tests/test-rcu-slist.cappear not to includeosdep.hintentionally. The remaining reverts are the same as in commitbbfff19688d.
Paolo
Quoted 437 lines
Signed-off-by Markus Armbruster <[email protected]>---
No real need to get this into 5.2 at this stage. No real risk either.contrib/vhost-user-gpu/vugbm.h | 2 -- contrib/vhost-user-gpu/vugpu.h | 1 - include/hw/block/swim.h | 1 - include/hw/display/macfb.h | 1 - include/qemu/nvdimm-utils.h | 1 - tests/qtest/fuzz/fuzz.h | 1 - tests/qtest/fuzz/generic_fuzz_configs.h | 1 - tools/virtiofsd/fuse_common.h | 2 -- tools/virtiofsd/fuse_log.h | 1 - tools/virtiofsd/fuse_lowlevel.h | 3 --- tools/virtiofsd/fuse_misc.h | 1 - tools/virtiofsd/passthrough_seccomp.h | 1 - contrib/vhost-user-gpu/virgl.c | 1 + contrib/vhost-user-gpu/vugbm.c | 1 + contrib/vhost-user-input/main.c | 1 - hw/display/artist.c | 1 - hw/s390x/s390-pci-vfio.c | 3 ++- tools/virtiofsd/buffer.c | 5 ----- tools/virtiofsd/fuse_log.c | 2 -- tools/virtiofsd/fuse_lowlevel.c | 10 ---------- tools/virtiofsd/fuse_opt.c | 4 ---- tools/virtiofsd/fuse_signals.c | 5 ----- tools/virtiofsd/fuse_virtio.c | 10 ---------- tools/virtiofsd/helper.c | 8 -------- tools/virtiofsd/passthrough_ll.c | 12 ------------ tools/virtiofsd/passthrough_seccomp.c | 3 --- util/nvdimm-utils.c | 1 + 27 files changed, 5 insertions(+), 78 deletions(-)contrib/vhost-user-gpu/vugbm.h +0
-2@@ -10,10 +10,8 @@#ifndef VHOST_USER_GPU_VUGBM_H #define VHOST_USER_GPU_VUGBM_H -#include "qemu/osdep.h" #ifdef CONFIG_MEMFD -#include <sys/mman.h> #include <sys/ioctl.h> #endif contrib/vhost-user-gpu/vugpu.h +0
-1@@ -15,7 +15,6 @@#ifndef VUGPU_H #define VUGPU_H -#include "qemu/osdep.h" #include "contrib/libvhost-user/libvhost-user-glib.h" #include "standard-headers/linux/virtio_gpu.h" include/hw/block/swim.h +0
-1@@ -11,7 +11,6 @@#ifndef SWIM_H #define SWIM_H -#include "qemu/osdep.h" #include "hw/sysbus.h" #include "qom/object.h" include/hw/display/macfb.h +0
-1@@ -13,7 +13,6 @@#ifndef MACFB_H #define MACFB_H -#include "qemu/osdep.h" #include "exec/memory.h" #include "ui/console.h" #include "qom/object.h" include/qemu/nvdimm-utils.h +0
-1@@ -1,7 +1,6 @@#ifndef NVDIMM_UTILS_H #define NVDIMM_UTILS_H -#include "qemu/osdep.h" GSList *nvdimm_get_device_list (void );#endif tests/qtest/fuzz/fuzz.h +0
-1@@ -14,7 +14,6 @@#ifndef FUZZER_H_ #define FUZZER_H_ -#include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" tests/qtest/fuzz/generic_fuzz_configs.h +0
-1@@ -13,7 +13,6 @@ #ifndef GENERIC_FUZZ_CONFIGS_H #define GENERIC_FUZZ_CONFIGS_H -#include "qemu/osdep.h" typedef struct generic_fuzz_config { const char *name, *args, *objects;tools/virtiofsd/fuse_common.h +0
-2@@ -18,8 +18,6 @@#include "fuse_log.h" #include "fuse_opt.h" -#include <stdint.h> -#include <sys/types.h> /** Major version of FUSE library interface */ #define FUSE_MAJOR_VERSION 3tools/virtiofsd/fuse_log.h +0
-1@@ -14,7 +14,6 @@* This file defines the logging interface of FUSE */ -#include <stdarg.h> /** * Log severity level tools/virtiofsd/fuse_lowlevel.h +0
-3@@ -25,10 +25,7 @@#include "fuse_common.h" -#include <fcntl.h> -#include <sys/stat.h> #include <sys/statvfs.h> -#include <sys/types.h> #include <sys/uio.h> #include <utime.h> tools/virtiofsd/fuse_misc.h +0
-1@@ -7,7 +7,6 @@*/ #include <pthread.h> -#include "config-host.h" /* * Versioned symbols cannot be used in some cases because it tools/virtiofsd/passthrough_seccomp.h +0
-1@@ -9,7 +9,6 @@#ifndef VIRTIOFSD_SECCOMP_H #define VIRTIOFSD_SECCOMP_H -#include <stdbool.h> void setup_seccomp (bool enable_syslog);contrib/vhost-user-gpu/virgl.c +1
-0@@ -12,6 +12,7 @@* See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include <virglrenderer.h> #include "virgl.h" contrib/vhost-user-gpu/vugbm.c +1
-0@@ -7,6 +7,7 @@* See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "vugbm.h" static boolcontrib/vhost-user-input/main.c +0
-1@@ -6,7 +6,6 @@#include "qemu/osdep.h" -#include <glib.h> #include <linux/input.h> #include "qemu/iov.h" hw/display/artist.c +0
-1@@ -9,7 +9,6 @@#include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/error-report.h" -#include "qemu/typedefs.h" #include "qemu/log.h" #include "qemu/module.h" #include "qemu/units.h" hw/s390x/s390-pci-vfio.c +2
-1@@ -9,11 +9,12 @@* directory. */ +#include "qemu/osdep.h" +#include <sys/ioctl.h> #include <linux/vfio.h> #include <linux/vfio_zdev.h> -#include "qemu/osdep.h" #include "trace.h" #include "hw/s390x/s390-pci-bus.h" #include "hw/s390x/s390-pci-clp.h" tools/virtiofsd/buffer.c +0
-5@@ -12,11 +12,6 @@#include "qemu/osdep.h" #include "fuse_i.h" #include "fuse_lowlevel.h" -#include <assert.h> -#include <errno.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> size_t fuse_buf_size (const struct fuse_bufvec *bufv) {tools/virtiofsd/fuse_log.c +0
-2@@ -11,8 +11,6 @@#include "qemu/osdep.h" #include "fuse_log.h" -#include <stdarg.h> -#include <stdio.h> static void default_log_func (__attribute__((unused))enum fuse_log_level level,const char *fmt,va_list ap)tools/virtiofsd/fuse_lowlevel.c +0
-10@@ -16,17 +16,7 @@#include "fuse_opt.h" #include "fuse_virtio.h" -#include <assert.h> -#include <errno.h> -#include <glib.h> -#include <limits.h> -#include <stdbool.h> -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/file.h> -#include <unistd.h> #define THREAD_POOL_SIZE 64tools/virtiofsd/fuse_opt.c +0
-4@@ -14,10 +14,6 @@#include "fuse_i.h" #include "fuse_misc.h" -#include <assert.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> struct fuse_opt_context {void *data;tools/virtiofsd/fuse_signals.c +0
-5@@ -12,11 +12,6 @@#include "fuse_i.h" #include "fuse_lowlevel.h" -#include <errno.h> -#include <signal.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> static struct fuse_session *fuse_instance;tools/virtiofsd/fuse_virtio.c +0
-10@@ -20,20 +20,10 @@#include "fuse_opt.h" #include "fuse_virtio.h" -#include <assert.h> -#include <errno.h> -#include <glib.h> -#include <stdint.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/eventfd.h> #include <sys/socket.h> -#include <sys/types.h> #include <sys/un.h> -#include <sys/types.h> #include <grp.h> -#include <unistd.h> #include "contrib/libvhost-user/libvhost-user.h" tools/virtiofsd/helper.c +0
-8@@ -16,16 +16,8 @@#include "fuse_misc.h" #include "fuse_opt.h" -#include <errno.h> -#include <limits.h> -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/param.h> -#include <sys/time.h> #include <sys/resource.h> -#include <unistd.h> #define FUSE_HELPER_OPT (t, p) \ { \tools/virtiofsd/passthrough_ll.c +0
-12@@ -41,29 +41,17 @@#include "fuse_log.h" #include "fuse_lowlevel.h" #include "standard-headers/linux/fuse.h" -#include <assert.h> #include <cap-ng.h> #include <dirent.h> -#include <errno.h> -#include <glib.h> -#include <inttypes.h> -#include <limits.h> #include <pthread.h> -#include <stdbool.h> -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/file.h> #include <sys/mount.h> #include <sys/prctl.h> #include <sys/resource.h> #include <sys/syscall.h> -#include <sys/types.h> #include <sys/wait.h> #include <sys/xattr.h> #include <syslog.h> -#include <unistd.h> #include "qemu/cutils.h" #include "passthrough_helpers.h" tools/virtiofsd/passthrough_seccomp.c +0
-3@@ -10,10 +10,7 @@#include "passthrough_seccomp.h" #include "fuse_i.h" #include "fuse_log.h" -#include <errno.h> -#include <glib.h> #include <seccomp.h> -#include <stdlib.h> /* Bodge for libseccomp 2.4.2 which broke ppoll */ #if !defined(__SNR_ppoll) && defined(__SNR_brk)util/nvdimm-utils.c +1
-0@@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include "qemu/nvdimm-utils.h" #include "hw/mem/nvdimm.h"
Quoted 31 lines · * Markus Armbruster ([email protected]) wrote:
Clean up includes so that
osdep.his included first and headers which it implies are not included manually.This commit was created with
scripts/clean-includes, with the changes to the following files manually reverted:contrib/libvhost-user/libvhost-user-glib.h contrib/libvhost-user/libvhost-user.c contrib/libvhost-user/libvhost-user.h contrib/plugins/hotblocks.c contrib/plugins/hotpages.c contrib/plugins/howvec.c contrib/plugins/lockstep.c linux-user/mips64/cpu_loop.c linux-user/mips64/signal.c linux-user/sparc64/cpu_loop.c linux-user/sparc64/signal.c linux-user/x86_64/cpu_loop.c linux-user/x86_64/signal.c target/s390x/gen-features.c tests/fp/platform.h tests/migration/s390x/a-b-bios.c tests/plugin/bb.c tests/plugin/empty.c tests/plugin/insn.c tests/plugin/mem.c tests/test-rcu-simpleq.c tests/test-rcu-slist.c tests/test-rcu-tailq.c tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c
Quoted 5 lines
contrib/plugins/, tests/plugin/, and
tests/test-rcu-slist.cappear not to includeosdep.hintentionally. The remaining reverts are the same as in commitbbfff19688d.Signed-off-by Markus Armbruster <[email protected]>
Yeh that looks ok for virtiofsd I think.
Quoted 438 lines
---
No real need to get this into 5.2 at this stage. No real risk either.contrib/vhost-user-gpu/vugbm.h | 2 -- contrib/vhost-user-gpu/vugpu.h | 1 - include/hw/block/swim.h | 1 - include/hw/display/macfb.h | 1 - include/qemu/nvdimm-utils.h | 1 - tests/qtest/fuzz/fuzz.h | 1 - tests/qtest/fuzz/generic_fuzz_configs.h | 1 - tools/virtiofsd/fuse_common.h | 2 -- tools/virtiofsd/fuse_log.h | 1 - tools/virtiofsd/fuse_lowlevel.h | 3 --- tools/virtiofsd/fuse_misc.h | 1 - tools/virtiofsd/passthrough_seccomp.h | 1 - contrib/vhost-user-gpu/virgl.c | 1 + contrib/vhost-user-gpu/vugbm.c | 1 + contrib/vhost-user-input/main.c | 1 - hw/display/artist.c | 1 - hw/s390x/s390-pci-vfio.c | 3 ++- tools/virtiofsd/buffer.c | 5 ----- tools/virtiofsd/fuse_log.c | 2 -- tools/virtiofsd/fuse_lowlevel.c | 10 ---------- tools/virtiofsd/fuse_opt.c | 4 ---- tools/virtiofsd/fuse_signals.c | 5 ----- tools/virtiofsd/fuse_virtio.c | 10 ---------- tools/virtiofsd/helper.c | 8 -------- tools/virtiofsd/passthrough_ll.c | 12 ------------ tools/virtiofsd/passthrough_seccomp.c | 3 --- util/nvdimm-utils.c | 1 + 27 files changed, 5 insertions(+), 78 deletions(-)contrib/vhost-user-gpu/vugbm.h +0
-2@@ -10,10 +10,8 @@#ifndef VHOST_USER_GPU_VUGBM_H #define VHOST_USER_GPU_VUGBM_H -#include "qemu/osdep.h" #ifdef CONFIG_MEMFD -#include <sys/mman.h> #include <sys/ioctl.h> #endif contrib/vhost-user-gpu/vugpu.h +0
-1@@ -15,7 +15,6 @@#ifndef VUGPU_H #define VUGPU_H -#include "qemu/osdep.h" #include "contrib/libvhost-user/libvhost-user-glib.h" #include "standard-headers/linux/virtio_gpu.h" include/hw/block/swim.h +0
-1@@ -11,7 +11,6 @@#ifndef SWIM_H #define SWIM_H -#include "qemu/osdep.h" #include "hw/sysbus.h" #include "qom/object.h" include/hw/display/macfb.h +0
-1@@ -13,7 +13,6 @@#ifndef MACFB_H #define MACFB_H -#include "qemu/osdep.h" #include "exec/memory.h" #include "ui/console.h" #include "qom/object.h" include/qemu/nvdimm-utils.h +0
-1@@ -1,7 +1,6 @@#ifndef NVDIMM_UTILS_H #define NVDIMM_UTILS_H -#include "qemu/osdep.h" GSList *nvdimm_get_device_list (void );#endif tests/qtest/fuzz/fuzz.h +0
-1@@ -14,7 +14,6 @@#ifndef FUZZER_H_ #define FUZZER_H_ -#include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" tests/qtest/fuzz/generic_fuzz_configs.h +0
-1@@ -13,7 +13,6 @@ #ifndef GENERIC_FUZZ_CONFIGS_H #define GENERIC_FUZZ_CONFIGS_H -#include "qemu/osdep.h" typedef struct generic_fuzz_config { const char *name, *args, *objects;tools/virtiofsd/fuse_common.h +0
-2@@ -18,8 +18,6 @@#include "fuse_log.h" #include "fuse_opt.h" -#include <stdint.h> -#include <sys/types.h> /** Major version of FUSE library interface */ #define FUSE_MAJOR_VERSION 3tools/virtiofsd/fuse_log.h +0
-1@@ -14,7 +14,6 @@* This file defines the logging interface of FUSE */ -#include <stdarg.h> /** * Log severity level tools/virtiofsd/fuse_lowlevel.h +0
-3@@ -25,10 +25,7 @@#include "fuse_common.h" -#include <fcntl.h> -#include <sys/stat.h> #include <sys/statvfs.h> -#include <sys/types.h> #include <sys/uio.h> #include <utime.h> tools/virtiofsd/fuse_misc.h +0
-1@@ -7,7 +7,6 @@*/ #include <pthread.h> -#include "config-host.h" /* * Versioned symbols cannot be used in some cases because it tools/virtiofsd/passthrough_seccomp.h +0
-1@@ -9,7 +9,6 @@#ifndef VIRTIOFSD_SECCOMP_H #define VIRTIOFSD_SECCOMP_H -#include <stdbool.h> void setup_seccomp (bool enable_syslog);contrib/vhost-user-gpu/virgl.c +1
-0@@ -12,6 +12,7 @@* See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include <virglrenderer.h> #include "virgl.h" contrib/vhost-user-gpu/vugbm.c +1
-0@@ -7,6 +7,7 @@* See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "vugbm.h" static boolcontrib/vhost-user-input/main.c +0
-1@@ -6,7 +6,6 @@#include "qemu/osdep.h" -#include <glib.h> #include <linux/input.h> #include "qemu/iov.h" hw/display/artist.c +0
-1@@ -9,7 +9,6 @@#include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/error-report.h" -#include "qemu/typedefs.h" #include "qemu/log.h" #include "qemu/module.h" #include "qemu/units.h" hw/s390x/s390-pci-vfio.c +2
-1@@ -9,11 +9,12 @@* directory. */ +#include "qemu/osdep.h" +#include <sys/ioctl.h> #include <linux/vfio.h> #include <linux/vfio_zdev.h> -#include "qemu/osdep.h" #include "trace.h" #include "hw/s390x/s390-pci-bus.h" #include "hw/s390x/s390-pci-clp.h" tools/virtiofsd/buffer.c +0
-5@@ -12,11 +12,6 @@#include "qemu/osdep.h" #include "fuse_i.h" #include "fuse_lowlevel.h" -#include <assert.h> -#include <errno.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> size_t fuse_buf_size (const struct fuse_bufvec *bufv) {tools/virtiofsd/fuse_log.c +0
-2@@ -11,8 +11,6 @@#include "qemu/osdep.h" #include "fuse_log.h" -#include <stdarg.h> -#include <stdio.h> static void default_log_func (__attribute__((unused))enum fuse_log_level level,const char *fmt,va_list ap)tools/virtiofsd/fuse_lowlevel.c +0
-10@@ -16,17 +16,7 @@#include "fuse_opt.h" #include "fuse_virtio.h" -#include <assert.h> -#include <errno.h> -#include <glib.h> -#include <limits.h> -#include <stdbool.h> -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/file.h> -#include <unistd.h> #define THREAD_POOL_SIZE 64tools/virtiofsd/fuse_opt.c +0
-4@@ -14,10 +14,6 @@#include "fuse_i.h" #include "fuse_misc.h" -#include <assert.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> struct fuse_opt_context {void *data;tools/virtiofsd/fuse_signals.c +0
-5@@ -12,11 +12,6 @@#include "fuse_i.h" #include "fuse_lowlevel.h" -#include <errno.h> -#include <signal.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> static struct fuse_session *fuse_instance;tools/virtiofsd/fuse_virtio.c +0
-10@@ -20,20 +20,10 @@#include "fuse_opt.h" #include "fuse_virtio.h" -#include <assert.h> -#include <errno.h> -#include <glib.h> -#include <stdint.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/eventfd.h> #include <sys/socket.h> -#include <sys/types.h> #include <sys/un.h> -#include <sys/types.h> #include <grp.h> -#include <unistd.h> #include "contrib/libvhost-user/libvhost-user.h" tools/virtiofsd/helper.c +0
-8@@ -16,16 +16,8 @@#include "fuse_misc.h" #include "fuse_opt.h" -#include <errno.h> -#include <limits.h> -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/param.h> -#include <sys/time.h> #include <sys/resource.h> -#include <unistd.h> #define FUSE_HELPER_OPT (t, p) \ { \tools/virtiofsd/passthrough_ll.c +0
-12@@ -41,29 +41,17 @@#include "fuse_log.h" #include "fuse_lowlevel.h" #include "standard-headers/linux/fuse.h" -#include <assert.h> #include <cap-ng.h> #include <dirent.h> -#include <errno.h> -#include <glib.h> -#include <inttypes.h> -#include <limits.h> #include <pthread.h> -#include <stdbool.h> -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/file.h> #include <sys/mount.h> #include <sys/prctl.h> #include <sys/resource.h> #include <sys/syscall.h> -#include <sys/types.h> #include <sys/wait.h> #include <sys/xattr.h> #include <syslog.h> -#include <unistd.h> #include "qemu/cutils.h" #include "passthrough_helpers.h" tools/virtiofsd/passthrough_seccomp.c +0
-3@@ -10,10 +10,7 @@#include "passthrough_seccomp.h" #include "fuse_i.h" #include "fuse_log.h" -#include <errno.h> -#include <glib.h> #include <seccomp.h> -#include <stdlib.h> /* Bodge for libseccomp 2.4.2 which broke ppoll */ #if !defined(__SNR_ppoll) && defined(__SNR_brk)util/nvdimm-utils.c +1
-0@@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include "qemu/nvdimm-utils.h" #include "hw/mem/nvdimm.h" Signature · 1 line
2.26.2
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Quoted 31 lines · Markus Armbruster
Clean up includes so that
osdep.his included first and headers which it implies are not included manually.This commit was created with
scripts/clean-includes, with the changes to the following files manually reverted:contrib/libvhost-user/libvhost-user-glib.h contrib/libvhost-user/libvhost-user.c contrib/libvhost-user/libvhost-user.h contrib/plugins/hotblocks.c contrib/plugins/hotpages.c contrib/plugins/howvec.c contrib/plugins/lockstep.c linux-user/mips64/cpu_loop.c linux-user/mips64/signal.c linux-user/sparc64/cpu_loop.c linux-user/sparc64/signal.c linux-user/x86_64/cpu_loop.c linux-user/x86_64/signal.c target/s390x/gen-features.c tests/fp/platform.h tests/migration/s390x/a-b-bios.c tests/plugin/bb.c tests/plugin/empty.c tests/plugin/insn.c tests/plugin/mem.c tests/test-rcu-simpleq.c tests/test-rcu-slist.c tests/test-rcu-tailq.c tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c
Quoted 7 lines
contrib/plugins/, tests/plugin/, and
tests/test-rcu-slist.cappear not to includeosdep.hintentionally. The remaining reverts are the same as in commitbbfff19688d.Signed-off-by Markus Armbruster <[email protected]>---
No real need to get this into 5.2 at this stage. No real risk either.
Seems to compile fine:
https://gitlab.com/huth/qemu/-/pipelines/215598144
https://cirrus-ci.com/build/6127772462481408
https://travis-ci.com/github/huth/qemu/builds/201194948
Quoted 59 lines · On Fri, 13 Nov 2020 07:12:16 +0100 Markus Armbruster <[email protected]> wrote:
Clean up includes so that
osdep.his included first and headers which it implies are not included manually.This commit was created with
scripts/clean-includes, with the changes to the following files manually reverted:contrib/libvhost-user/libvhost-user-glib.h contrib/libvhost-user/libvhost-user.c contrib/libvhost-user/libvhost-user.h contrib/plugins/hotblocks.c contrib/plugins/hotpages.c contrib/plugins/howvec.c contrib/plugins/lockstep.c linux-user/mips64/cpu_loop.c linux-user/mips64/signal.c linux-user/sparc64/cpu_loop.c linux-user/sparc64/signal.c linux-user/x86_64/cpu_loop.c linux-user/x86_64/signal.c target/s390x/gen-features.c tests/fp/platform.h tests/migration/s390x/a-b-bios.c tests/plugin/bb.c tests/plugin/empty.c tests/plugin/insn.c tests/plugin/mem.c tests/test-rcu-simpleq.c tests/test-rcu-slist.c tests/test-rcu-tailq.c tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.ccontrib/plugins/, tests/plugin/, and
tests/test-rcu-slist.cappear not to includeosdep.hintentionally. The remaining reverts are the same as in commitbbfff19688d.Signed-off-by Markus Armbruster <[email protected]>---
No real need to get this into 5.2 at this stage. No real risk either.contrib/vhost-user-gpu/vugbm.h | 2 -- contrib/vhost-user-gpu/vugpu.h | 1 - include/hw/block/swim.h | 1 - include/hw/display/macfb.h | 1 - include/qemu/nvdimm-utils.h | 1 - tests/qtest/fuzz/fuzz.h | 1 - tests/qtest/fuzz/generic_fuzz_configs.h | 1 - tools/virtiofsd/fuse_common.h | 2 -- tools/virtiofsd/fuse_log.h | 1 - tools/virtiofsd/fuse_lowlevel.h | 3 --- tools/virtiofsd/fuse_misc.h | 1 - tools/virtiofsd/passthrough_seccomp.h | 1 - contrib/vhost-user-gpu/virgl.c | 1 + contrib/vhost-user-gpu/vugbm.c | 1 + contrib/vhost-user-input/main.c | 1 - hw/display/artist.c | 1 - hw/s390x/s390-pci-vfio.c | 3 ++- tools/virtiofsd/buffer.c | 5 ----- tools/virtiofsd/fuse_log.c | 2 -- tools/virtiofsd/fuse_lowlevel.c | 10 ----------
Quoted 8 lines
tools/virtiofsd/fuse_opt.c | 4 ---- tools/virtiofsd/fuse_signals.c | 5 ----- tools/virtiofsd/fuse_virtio.c | 10 ---------- tools/virtiofsd/helper.c | 8 -------- tools/virtiofsd/passthrough_ll.c | 12 ------------ tools/virtiofsd/passthrough_seccomp.c | 3 --- util/nvdimm-utils.c | 1 + 27 files changed, 5 insertions(+), 78 deletions(-)
Quoted 31 lines · Markus Armbruster
Clean up includes so that
osdep.his included first and headers which it implies are not included manually.This commit was created with
scripts/clean-includes, with the changes to the following files manually reverted:contrib/libvhost-user/libvhost-user-glib.h contrib/libvhost-user/libvhost-user.c contrib/libvhost-user/libvhost-user.h contrib/plugins/hotblocks.c contrib/plugins/hotpages.c contrib/plugins/howvec.c contrib/plugins/lockstep.c linux-user/mips64/cpu_loop.c linux-user/mips64/signal.c linux-user/sparc64/cpu_loop.c linux-user/sparc64/signal.c linux-user/x86_64/cpu_loop.c linux-user/x86_64/signal.c target/s390x/gen-features.c tests/fp/platform.h tests/migration/s390x/a-b-bios.c tests/plugin/bb.c tests/plugin/empty.c tests/plugin/insn.c tests/plugin/mem.c tests/test-rcu-simpleq.c tests/test-rcu-slist.c tests/test-rcu-tailq.c tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c
Quoted 5 lines
contrib/plugins/, tests/plugin/, and
tests/test-rcu-slist.cappear not to includeosdep.hintentionally. The remaining reverts are the same as in commitbbfff19688d.Signed-off-by Markus Armbruster <[email protected]>
Quoted 437 lines
---
No real need to get this into 5.2 at this stage. No real risk either.contrib/vhost-user-gpu/vugbm.h | 2 -- contrib/vhost-user-gpu/vugpu.h | 1 - include/hw/block/swim.h | 1 - include/hw/display/macfb.h | 1 - include/qemu/nvdimm-utils.h | 1 - tests/qtest/fuzz/fuzz.h | 1 - tests/qtest/fuzz/generic_fuzz_configs.h | 1 - tools/virtiofsd/fuse_common.h | 2 -- tools/virtiofsd/fuse_log.h | 1 - tools/virtiofsd/fuse_lowlevel.h | 3 --- tools/virtiofsd/fuse_misc.h | 1 - tools/virtiofsd/passthrough_seccomp.h | 1 - contrib/vhost-user-gpu/virgl.c | 1 + contrib/vhost-user-gpu/vugbm.c | 1 + contrib/vhost-user-input/main.c | 1 - hw/display/artist.c | 1 - hw/s390x/s390-pci-vfio.c | 3 ++- tools/virtiofsd/buffer.c | 5 ----- tools/virtiofsd/fuse_log.c | 2 -- tools/virtiofsd/fuse_lowlevel.c | 10 ---------- tools/virtiofsd/fuse_opt.c | 4 ---- tools/virtiofsd/fuse_signals.c | 5 ----- tools/virtiofsd/fuse_virtio.c | 10 ---------- tools/virtiofsd/helper.c | 8 -------- tools/virtiofsd/passthrough_ll.c | 12 ------------ tools/virtiofsd/passthrough_seccomp.c | 3 --- util/nvdimm-utils.c | 1 + 27 files changed, 5 insertions(+), 78 deletions(-)contrib/vhost-user-gpu/vugbm.h +0
-2@@ -10,10 +10,8 @@#ifndef VHOST_USER_GPU_VUGBM_H #define VHOST_USER_GPU_VUGBM_H -#include "qemu/osdep.h" #ifdef CONFIG_MEMFD -#include <sys/mman.h> #include <sys/ioctl.h> #endif contrib/vhost-user-gpu/vugpu.h +0
-1@@ -15,7 +15,6 @@#ifndef VUGPU_H #define VUGPU_H -#include "qemu/osdep.h" #include "contrib/libvhost-user/libvhost-user-glib.h" #include "standard-headers/linux/virtio_gpu.h" include/hw/block/swim.h +0
-1@@ -11,7 +11,6 @@#ifndef SWIM_H #define SWIM_H -#include "qemu/osdep.h" #include "hw/sysbus.h" #include "qom/object.h" include/hw/display/macfb.h +0
-1@@ -13,7 +13,6 @@#ifndef MACFB_H #define MACFB_H -#include "qemu/osdep.h" #include "exec/memory.h" #include "ui/console.h" #include "qom/object.h" include/qemu/nvdimm-utils.h +0
-1@@ -1,7 +1,6 @@#ifndef NVDIMM_UTILS_H #define NVDIMM_UTILS_H -#include "qemu/osdep.h" GSList *nvdimm_get_device_list (void );#endif tests/qtest/fuzz/fuzz.h +0
-1@@ -14,7 +14,6 @@#ifndef FUZZER_H_ #define FUZZER_H_ -#include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" tests/qtest/fuzz/generic_fuzz_configs.h +0
-1@@ -13,7 +13,6 @@ #ifndef GENERIC_FUZZ_CONFIGS_H #define GENERIC_FUZZ_CONFIGS_H -#include "qemu/osdep.h" typedef struct generic_fuzz_config { const char *name, *args, *objects;tools/virtiofsd/fuse_common.h +0
-2@@ -18,8 +18,6 @@#include "fuse_log.h" #include "fuse_opt.h" -#include <stdint.h> -#include <sys/types.h> /** Major version of FUSE library interface */ #define FUSE_MAJOR_VERSION 3tools/virtiofsd/fuse_log.h +0
-1@@ -14,7 +14,6 @@* This file defines the logging interface of FUSE */ -#include <stdarg.h> /** * Log severity level tools/virtiofsd/fuse_lowlevel.h +0
-3@@ -25,10 +25,7 @@#include "fuse_common.h" -#include <fcntl.h> -#include <sys/stat.h> #include <sys/statvfs.h> -#include <sys/types.h> #include <sys/uio.h> #include <utime.h> tools/virtiofsd/fuse_misc.h +0
-1@@ -7,7 +7,6 @@*/ #include <pthread.h> -#include "config-host.h" /* * Versioned symbols cannot be used in some cases because it tools/virtiofsd/passthrough_seccomp.h +0
-1@@ -9,7 +9,6 @@#ifndef VIRTIOFSD_SECCOMP_H #define VIRTIOFSD_SECCOMP_H -#include <stdbool.h> void setup_seccomp (bool enable_syslog);contrib/vhost-user-gpu/virgl.c +1
-0@@ -12,6 +12,7 @@* See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include <virglrenderer.h> #include "virgl.h" contrib/vhost-user-gpu/vugbm.c +1
-0@@ -7,6 +7,7 @@* See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "vugbm.h" static boolcontrib/vhost-user-input/main.c +0
-1@@ -6,7 +6,6 @@#include "qemu/osdep.h" -#include <glib.h> #include <linux/input.h> #include "qemu/iov.h" hw/display/artist.c +0
-1@@ -9,7 +9,6 @@#include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/error-report.h" -#include "qemu/typedefs.h" #include "qemu/log.h" #include "qemu/module.h" #include "qemu/units.h" hw/s390x/s390-pci-vfio.c +2
-1@@ -9,11 +9,12 @@* directory. */ +#include "qemu/osdep.h" +#include <sys/ioctl.h> #include <linux/vfio.h> #include <linux/vfio_zdev.h> -#include "qemu/osdep.h" #include "trace.h" #include "hw/s390x/s390-pci-bus.h" #include "hw/s390x/s390-pci-clp.h" tools/virtiofsd/buffer.c +0
-5@@ -12,11 +12,6 @@#include "qemu/osdep.h" #include "fuse_i.h" #include "fuse_lowlevel.h" -#include <assert.h> -#include <errno.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> size_t fuse_buf_size (const struct fuse_bufvec *bufv) {tools/virtiofsd/fuse_log.c +0
-2@@ -11,8 +11,6 @@#include "qemu/osdep.h" #include "fuse_log.h" -#include <stdarg.h> -#include <stdio.h> static void default_log_func (__attribute__((unused))enum fuse_log_level level,const char *fmt,va_list ap)tools/virtiofsd/fuse_lowlevel.c +0
-10@@ -16,17 +16,7 @@#include "fuse_opt.h" #include "fuse_virtio.h" -#include <assert.h> -#include <errno.h> -#include <glib.h> -#include <limits.h> -#include <stdbool.h> -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/file.h> -#include <unistd.h> #define THREAD_POOL_SIZE 64tools/virtiofsd/fuse_opt.c +0
-4@@ -14,10 +14,6 @@#include "fuse_i.h" #include "fuse_misc.h" -#include <assert.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> struct fuse_opt_context {void *data;tools/virtiofsd/fuse_signals.c +0
-5@@ -12,11 +12,6 @@#include "fuse_i.h" #include "fuse_lowlevel.h" -#include <errno.h> -#include <signal.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> static struct fuse_session *fuse_instance;tools/virtiofsd/fuse_virtio.c +0
-10@@ -20,20 +20,10 @@#include "fuse_opt.h" #include "fuse_virtio.h" -#include <assert.h> -#include <errno.h> -#include <glib.h> -#include <stdint.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/eventfd.h> #include <sys/socket.h> -#include <sys/types.h> #include <sys/un.h> -#include <sys/types.h> #include <grp.h> -#include <unistd.h> #include "contrib/libvhost-user/libvhost-user.h" tools/virtiofsd/helper.c +0
-8@@ -16,16 +16,8 @@#include "fuse_misc.h" #include "fuse_opt.h" -#include <errno.h> -#include <limits.h> -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/param.h> -#include <sys/time.h> #include <sys/resource.h> -#include <unistd.h> #define FUSE_HELPER_OPT (t, p) \ { \tools/virtiofsd/passthrough_ll.c +0
-12@@ -41,29 +41,17 @@#include "fuse_log.h" #include "fuse_lowlevel.h" #include "standard-headers/linux/fuse.h" -#include <assert.h> #include <cap-ng.h> #include <dirent.h> -#include <errno.h> -#include <glib.h> -#include <inttypes.h> -#include <limits.h> #include <pthread.h> -#include <stdbool.h> -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/file.h> #include <sys/mount.h> #include <sys/prctl.h> #include <sys/resource.h> #include <sys/syscall.h> -#include <sys/types.h> #include <sys/wait.h> #include <sys/xattr.h> #include <syslog.h> -#include <unistd.h> #include "qemu/cutils.h" #include "passthrough_helpers.h" tools/virtiofsd/passthrough_seccomp.c +0
-3@@ -10,10 +10,7 @@#include "passthrough_seccomp.h" #include "fuse_i.h" #include "fuse_log.h" -#include <errno.h> -#include <glib.h> #include <seccomp.h> -#include <stdlib.h> /* Bodge for libseccomp 2.4.2 which broke ppoll */ #if !defined(__SNR_ppoll) && defined(__SNR_brk)util/nvdimm-utils.c +1
-0@@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include "qemu/nvdimm-utils.h" #include "hw/mem/nvdimm.h" Signature · 1 line
2.26.2
Quoted 59 lines · Markus Armbruster
Clean up includes so that
osdep.his included first and headers which it implies are not included manually.This commit was created with
scripts/clean-includes, with the changes to the following files manually reverted:contrib/libvhost-user/libvhost-user-glib.h contrib/libvhost-user/libvhost-user.c contrib/libvhost-user/libvhost-user.h contrib/plugins/hotblocks.c contrib/plugins/hotpages.c contrib/plugins/howvec.c contrib/plugins/lockstep.c linux-user/mips64/cpu_loop.c linux-user/mips64/signal.c linux-user/sparc64/cpu_loop.c linux-user/sparc64/signal.c linux-user/x86_64/cpu_loop.c linux-user/x86_64/signal.c target/s390x/gen-features.c tests/fp/platform.h tests/migration/s390x/a-b-bios.c tests/plugin/bb.c tests/plugin/empty.c tests/plugin/insn.c tests/plugin/mem.c tests/test-rcu-simpleq.c tests/test-rcu-slist.c tests/test-rcu-tailq.c tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.ccontrib/plugins/, tests/plugin/, and
tests/test-rcu-slist.cappear not to includeosdep.hintentionally. The remaining reverts are the same as in commitbbfff19688d.Signed-off-by Markus Armbruster <[email protected]>---
No real need to get this into 5.2 at this stage. No real risk either.contrib/vhost-user-gpu/vugbm.h | 2 -- contrib/vhost-user-gpu/vugpu.h | 1 - include/hw/block/swim.h | 1 - include/hw/display/macfb.h | 1 - include/qemu/nvdimm-utils.h | 1 - tests/qtest/fuzz/fuzz.h | 1 - tests/qtest/fuzz/generic_fuzz_configs.h | 1 - tools/virtiofsd/fuse_common.h | 2 -- tools/virtiofsd/fuse_log.h | 1 - tools/virtiofsd/fuse_lowlevel.h | 3 --- tools/virtiofsd/fuse_misc.h | 1 - tools/virtiofsd/passthrough_seccomp.h | 1 - contrib/vhost-user-gpu/virgl.c | 1 + contrib/vhost-user-gpu/vugbm.c | 1 + contrib/vhost-user-input/main.c | 1 - hw/display/artist.c | 1 - hw/s390x/s390-pci-vfio.c | 3 ++- tools/virtiofsd/buffer.c | 5 ----- tools/virtiofsd/fuse_log.c | 2 -- tools/virtiofsd/fuse_lowlevel.c | 10 ----------
Quoted 8 lines
tools/virtiofsd/fuse_opt.c | 4 ---- tools/virtiofsd/fuse_signals.c | 5 ----- tools/virtiofsd/fuse_virtio.c | 10 ---------- tools/virtiofsd/helper.c | 8 -------- tools/virtiofsd/passthrough_ll.c | 12 ------------ tools/virtiofsd/passthrough_seccomp.c | 3 --- util/nvdimm-utils.c | 1 + 27 files changed, 5 insertions(+), 78 deletions(-)
Quoted 31 lines · Markus Armbruster
Clean up includes so that
osdep.his included first and headers which it implies are not included manually.This commit was created with
scripts/clean-includes, with the changes to the following files manually reverted:contrib/libvhost-user/libvhost-user-glib.h contrib/libvhost-user/libvhost-user.c contrib/libvhost-user/libvhost-user.h contrib/plugins/hotblocks.c contrib/plugins/hotpages.c contrib/plugins/howvec.c contrib/plugins/lockstep.c linux-user/mips64/cpu_loop.c linux-user/mips64/signal.c linux-user/sparc64/cpu_loop.c linux-user/sparc64/signal.c linux-user/x86_64/cpu_loop.c linux-user/x86_64/signal.c target/s390x/gen-features.c tests/fp/platform.h tests/migration/s390x/a-b-bios.c tests/plugin/bb.c tests/plugin/empty.c tests/plugin/insn.c tests/plugin/mem.c tests/test-rcu-simpleq.c tests/test-rcu-slist.c tests/test-rcu-tailq.c tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c
Quoted 5 lines
contrib/plugins/, tests/plugin/, and
tests/test-rcu-slist.cappear not to includeosdep.hintentionally. The remaining reverts are the same as in commitbbfff19688d.Signed-off-by Markus Armbruster <[email protected]>
Thank you
Quoted 438 lines
---
No real need to get this into 5.2 at this stage. No real risk either.contrib/vhost-user-gpu/vugbm.h | 2 -- contrib/vhost-user-gpu/vugpu.h | 1 - include/hw/block/swim.h | 1 - include/hw/display/macfb.h | 1 - include/qemu/nvdimm-utils.h | 1 - tests/qtest/fuzz/fuzz.h | 1 - tests/qtest/fuzz/generic_fuzz_configs.h | 1 - tools/virtiofsd/fuse_common.h | 2 -- tools/virtiofsd/fuse_log.h | 1 - tools/virtiofsd/fuse_lowlevel.h | 3 --- tools/virtiofsd/fuse_misc.h | 1 - tools/virtiofsd/passthrough_seccomp.h | 1 - contrib/vhost-user-gpu/virgl.c | 1 + contrib/vhost-user-gpu/vugbm.c | 1 + contrib/vhost-user-input/main.c | 1 - hw/display/artist.c | 1 - hw/s390x/s390-pci-vfio.c | 3 ++- tools/virtiofsd/buffer.c | 5 ----- tools/virtiofsd/fuse_log.c | 2 -- tools/virtiofsd/fuse_lowlevel.c | 10 ---------- tools/virtiofsd/fuse_opt.c | 4 ---- tools/virtiofsd/fuse_signals.c | 5 ----- tools/virtiofsd/fuse_virtio.c | 10 ---------- tools/virtiofsd/helper.c | 8 -------- tools/virtiofsd/passthrough_ll.c | 12 ------------ tools/virtiofsd/passthrough_seccomp.c | 3 --- util/nvdimm-utils.c | 1 + 27 files changed, 5 insertions(+), 78 deletions(-)contrib/vhost-user-gpu/vugbm.h +0
-2@@ -10,10 +10,8 @@#ifndef VHOST_USER_GPU_VUGBM_H #define VHOST_USER_GPU_VUGBM_H -#include "qemu/osdep.h" #ifdef CONFIG_MEMFD -#include <sys/mman.h> #include <sys/ioctl.h> #endif contrib/vhost-user-gpu/vugpu.h +0
-1@@ -15,7 +15,6 @@#ifndef VUGPU_H #define VUGPU_H -#include "qemu/osdep.h" #include "contrib/libvhost-user/libvhost-user-glib.h" #include "standard-headers/linux/virtio_gpu.h" include/hw/block/swim.h +0
-1@@ -11,7 +11,6 @@#ifndef SWIM_H #define SWIM_H -#include "qemu/osdep.h" #include "hw/sysbus.h" #include "qom/object.h" include/hw/display/macfb.h +0
-1@@ -13,7 +13,6 @@#ifndef MACFB_H #define MACFB_H -#include "qemu/osdep.h" #include "exec/memory.h" #include "ui/console.h" #include "qom/object.h" include/qemu/nvdimm-utils.h +0
-1@@ -1,7 +1,6 @@#ifndef NVDIMM_UTILS_H #define NVDIMM_UTILS_H -#include "qemu/osdep.h" GSList *nvdimm_get_device_list (void );#endif tests/qtest/fuzz/fuzz.h +0
-1@@ -14,7 +14,6 @@#ifndef FUZZER_H_ #define FUZZER_H_ -#include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" tests/qtest/fuzz/generic_fuzz_configs.h +0
-1@@ -13,7 +13,6 @@ #ifndef GENERIC_FUZZ_CONFIGS_H #define GENERIC_FUZZ_CONFIGS_H -#include "qemu/osdep.h" typedef struct generic_fuzz_config { const char *name, *args, *objects;tools/virtiofsd/fuse_common.h +0
-2@@ -18,8 +18,6 @@#include "fuse_log.h" #include "fuse_opt.h" -#include <stdint.h> -#include <sys/types.h> /** Major version of FUSE library interface */ #define FUSE_MAJOR_VERSION 3tools/virtiofsd/fuse_log.h +0
-1@@ -14,7 +14,6 @@* This file defines the logging interface of FUSE */ -#include <stdarg.h> /** * Log severity level tools/virtiofsd/fuse_lowlevel.h +0
-3@@ -25,10 +25,7 @@#include "fuse_common.h" -#include <fcntl.h> -#include <sys/stat.h> #include <sys/statvfs.h> -#include <sys/types.h> #include <sys/uio.h> #include <utime.h> tools/virtiofsd/fuse_misc.h +0
-1@@ -7,7 +7,6 @@*/ #include <pthread.h> -#include "config-host.h" /* * Versioned symbols cannot be used in some cases because it tools/virtiofsd/passthrough_seccomp.h +0
-1@@ -9,7 +9,6 @@#ifndef VIRTIOFSD_SECCOMP_H #define VIRTIOFSD_SECCOMP_H -#include <stdbool.h> void setup_seccomp (bool enable_syslog);contrib/vhost-user-gpu/virgl.c +1
-0@@ -12,6 +12,7 @@* See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include <virglrenderer.h> #include "virgl.h" contrib/vhost-user-gpu/vugbm.c +1
-0@@ -7,6 +7,7 @@* See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "vugbm.h" static boolcontrib/vhost-user-input/main.c +0
-1@@ -6,7 +6,6 @@#include "qemu/osdep.h" -#include <glib.h> #include <linux/input.h> #include "qemu/iov.h" hw/display/artist.c +0
-1@@ -9,7 +9,6 @@#include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/error-report.h" -#include "qemu/typedefs.h" #include "qemu/log.h" #include "qemu/module.h" #include "qemu/units.h" hw/s390x/s390-pci-vfio.c +2
-1@@ -9,11 +9,12 @@* directory. */ +#include "qemu/osdep.h" +#include <sys/ioctl.h> #include <linux/vfio.h> #include <linux/vfio_zdev.h> -#include "qemu/osdep.h" #include "trace.h" #include "hw/s390x/s390-pci-bus.h" #include "hw/s390x/s390-pci-clp.h" tools/virtiofsd/buffer.c +0
-5@@ -12,11 +12,6 @@#include "qemu/osdep.h" #include "fuse_i.h" #include "fuse_lowlevel.h" -#include <assert.h> -#include <errno.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> size_t fuse_buf_size (const struct fuse_bufvec *bufv) {tools/virtiofsd/fuse_log.c +0
-2@@ -11,8 +11,6 @@#include "qemu/osdep.h" #include "fuse_log.h" -#include <stdarg.h> -#include <stdio.h> static void default_log_func (__attribute__((unused))enum fuse_log_level level,const char *fmt,va_list ap)tools/virtiofsd/fuse_lowlevel.c +0
-10@@ -16,17 +16,7 @@#include "fuse_opt.h" #include "fuse_virtio.h" -#include <assert.h> -#include <errno.h> -#include <glib.h> -#include <limits.h> -#include <stdbool.h> -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/file.h> -#include <unistd.h> #define THREAD_POOL_SIZE 64tools/virtiofsd/fuse_opt.c +0
-4@@ -14,10 +14,6 @@#include "fuse_i.h" #include "fuse_misc.h" -#include <assert.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> struct fuse_opt_context {void *data;tools/virtiofsd/fuse_signals.c +0
-5@@ -12,11 +12,6 @@#include "fuse_i.h" #include "fuse_lowlevel.h" -#include <errno.h> -#include <signal.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> static struct fuse_session *fuse_instance;tools/virtiofsd/fuse_virtio.c +0
-10@@ -20,20 +20,10 @@#include "fuse_opt.h" #include "fuse_virtio.h" -#include <assert.h> -#include <errno.h> -#include <glib.h> -#include <stdint.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/eventfd.h> #include <sys/socket.h> -#include <sys/types.h> #include <sys/un.h> -#include <sys/types.h> #include <grp.h> -#include <unistd.h> #include "contrib/libvhost-user/libvhost-user.h" tools/virtiofsd/helper.c +0
-8@@ -16,16 +16,8 @@#include "fuse_misc.h" #include "fuse_opt.h" -#include <errno.h> -#include <limits.h> -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/param.h> -#include <sys/time.h> #include <sys/resource.h> -#include <unistd.h> #define FUSE_HELPER_OPT (t, p) \ { \tools/virtiofsd/passthrough_ll.c +0
-12@@ -41,29 +41,17 @@#include "fuse_log.h" #include "fuse_lowlevel.h" #include "standard-headers/linux/fuse.h" -#include <assert.h> #include <cap-ng.h> #include <dirent.h> -#include <errno.h> -#include <glib.h> -#include <inttypes.h> -#include <limits.h> #include <pthread.h> -#include <stdbool.h> -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/file.h> #include <sys/mount.h> #include <sys/prctl.h> #include <sys/resource.h> #include <sys/syscall.h> -#include <sys/types.h> #include <sys/wait.h> #include <sys/xattr.h> #include <syslog.h> -#include <unistd.h> #include "qemu/cutils.h" #include "passthrough_helpers.h" tools/virtiofsd/passthrough_seccomp.c +0
-3@@ -10,10 +10,7 @@#include "passthrough_seccomp.h" #include "fuse_i.h" #include "fuse_log.h" -#include <errno.h> -#include <glib.h> #include <seccomp.h> -#include <stdlib.h> /* Bodge for libseccomp 2.4.2 which broke ppoll */ #if !defined(__SNR_ppoll) && defined(__SNR_brk)util/nvdimm-utils.c +1
-0@@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include "qemu/nvdimm-utils.h" #include "hw/mem/nvdimm.h" Signature · 1 line
2.26.2