diff options
| author | Markus Armbruster <armbru@redhat.com> | 2020-11-13 07:12:16 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2020-12-10 17:16:44 +0100 |
| commit | 4bd802b209cff612d1a99674a91895b735be8630 (patch) | |
| tree | 62dc4857d7c31b353981b53d8fb52e692f6cfc0b /contrib/vhost-user-gpu | |
| parent | 00ef48ff0de9c3e5834e7e3f6691bbc80d08c114 (diff) | |
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.c
contrib/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.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201113061216.2483385-1-armbru@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Acked-by: Alexander Bulekov <alxndr@bu.edu>
Diffstat (limited to 'contrib/vhost-user-gpu')
| -rw-r--r-- | contrib/vhost-user-gpu/virgl.c | 1 | ||||
| -rw-r--r-- | contrib/vhost-user-gpu/vugbm.c | 1 | ||||
| -rw-r--r-- | contrib/vhost-user-gpu/vugbm.h | 2 | ||||
| -rw-r--r-- | contrib/vhost-user-gpu/vugpu.h | 1 |
4 files changed, 2 insertions, 3 deletions
diff --git a/contrib/vhost-user-gpu/virgl.c b/contrib/vhost-user-gpu/virgl.c index b0bc22c3c1..e647278052 100644 --- a/contrib/vhost-user-gpu/virgl.c +++ b/contrib/vhost-user-gpu/virgl.c @@ -12,6 +12,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include <virglrenderer.h> #include "virgl.h" diff --git a/contrib/vhost-user-gpu/vugbm.c b/contrib/vhost-user-gpu/vugbm.c index 9c357b6399..f5304ada2f 100644 --- a/contrib/vhost-user-gpu/vugbm.c +++ b/contrib/vhost-user-gpu/vugbm.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "vugbm.h" static bool diff --git a/contrib/vhost-user-gpu/vugbm.h b/contrib/vhost-user-gpu/vugbm.h index 07e698fcd7..66f1520764 100644 --- a/contrib/vhost-user-gpu/vugbm.h +++ b/contrib/vhost-user-gpu/vugbm.h @@ -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 diff --git a/contrib/vhost-user-gpu/vugpu.h b/contrib/vhost-user-gpu/vugpu.h index bdf9a74b46..ad664c4df8 100644 --- a/contrib/vhost-user-gpu/vugpu.h +++ b/contrib/vhost-user-gpu/vugpu.h @@ -15,7 +15,6 @@ #ifndef VUGPU_H #define VUGPU_H -#include "qemu/osdep.h" #include "libvhost-user-glib.h" #include "standard-headers/linux/virtio_gpu.h" |