diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2016-01-29 17:50:05 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2016-02-04 17:41:30 +0000 |
commit | d38ea87ac54af64ef611de434d07c12dc0399216 (patch) | |
tree | 58bf1154cf210524d587a66cf3605adb5ada6489 | |
parent | ccd241b5a2223c502441714d413d569565e4a3b4 (diff) |
all: 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.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1454089805-5470-16-git-send-email-peter.maydell@linaro.org
-rw-r--r-- | accel.c | 1 | ||||
-rw-r--r-- | aio-posix.c | 1 | ||||
-rw-r--r-- | aio-win32.c | 1 | ||||
-rw-r--r-- | arch_init.c | 2 | ||||
-rw-r--r-- | async.c | 1 | ||||
-rw-r--r-- | balloon.c | 1 | ||||
-rw-r--r-- | block.c | 4 | ||||
-rw-r--r-- | blockdev-nbd.c | 1 | ||||
-rw-r--r-- | blockdev.c | 1 | ||||
-rw-r--r-- | blockjob.c | 2 | ||||
-rw-r--r-- | bootdevice.c | 1 | ||||
-rw-r--r-- | bt-host.c | 2 | ||||
-rw-r--r-- | bt-vhci.c | 1 | ||||
-rw-r--r-- | device-hotplug.c | 1 | ||||
-rw-r--r-- | device_tree.c | 7 | ||||
-rw-r--r-- | disas.c | 3 | ||||
-rw-r--r-- | dma-helpers.c | 1 | ||||
-rw-r--r-- | dump.c | 2 | ||||
-rw-r--r-- | fpu/softfloat.c | 3 | ||||
-rw-r--r-- | gdbstub.c | 9 | ||||
-rw-r--r-- | hmp.c | 1 | ||||
-rw-r--r-- | iohandler.c | 2 | ||||
-rw-r--r-- | ioport.c | 1 | ||||
-rw-r--r-- | iothread.c | 1 | ||||
-rw-r--r-- | kvm-all.c | 3 | ||||
-rw-r--r-- | kvm-stub.c | 1 | ||||
-rw-r--r-- | main-loop.c | 1 | ||||
-rw-r--r-- | memory.c | 2 | ||||
-rw-r--r-- | memory_mapping.c | 1 | ||||
-rw-r--r-- | module-common.c | 2 | ||||
-rw-r--r-- | monitor.c | 2 | ||||
-rw-r--r-- | nbd/client.c | 1 | ||||
-rw-r--r-- | nbd/common.c | 1 | ||||
-rw-r--r-- | nbd/server.c | 1 | ||||
-rw-r--r-- | numa.c | 1 | ||||
-rw-r--r-- | os-posix.c | 6 | ||||
-rw-r--r-- | os-win32.c | 7 | ||||
-rw-r--r-- | page_cache.c | 8 | ||||
-rw-r--r-- | qdev-monitor.c | 1 | ||||
-rw-r--r-- | qemu-bridge-helper.c | 13 | ||||
-rw-r--r-- | qemu-char.c | 8 | ||||
-rw-r--r-- | qemu-nbd.c | 5 | ||||
-rw-r--r-- | qemu-seccomp.c | 2 | ||||
-rw-r--r-- | qemu-timer.c | 1 | ||||
-rw-r--r-- | qjson.c | 2 | ||||
-rw-r--r-- | qmp.c | 1 | ||||
-rw-r--r-- | qtest.c | 1 | ||||
-rw-r--r-- | replay/replay-events.c | 1 | ||||
-rw-r--r-- | replay/replay-input.c | 1 | ||||
-rw-r--r-- | replay/replay-internal.c | 1 | ||||
-rw-r--r-- | replay/replay-time.c | 1 | ||||
-rw-r--r-- | replay/replay.c | 1 | ||||
-rw-r--r-- | spice-qemu-char.c | 3 | ||||
-rw-r--r-- | tcg-runtime.c | 2 | ||||
-rw-r--r-- | tci.c | 2 | ||||
-rw-r--r-- | thread-pool.c | 2 | ||||
-rw-r--r-- | thunk.c | 4 | ||||
-rw-r--r-- | tpm.c | 2 | ||||
-rw-r--r-- | trace/control.c | 1 | ||||
-rw-r--r-- | trace/ftrace.c | 5 | ||||
-rw-r--r-- | trace/qmp.c | 1 | ||||
-rw-r--r-- | trace/simple.c | 6 | ||||
-rw-r--r-- | user-exec.c | 3 | ||||
-rw-r--r-- | util/log.c | 1 | ||||
-rw-r--r-- | vl.c | 9 |
65 files changed, 66 insertions, 101 deletions
@@ -23,6 +23,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "sysemu/accel.h" #include "hw/boards.h" #include "qemu-common.h" diff --git a/aio-posix.c b/aio-posix.c index 482b316502..fa7f8ab2a5 100644 --- a/aio-posix.c +++ b/aio-posix.c @@ -13,6 +13,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "block/block.h" #include "qemu/queue.h" diff --git a/aio-win32.c b/aio-win32.c index cdc445608b..6aaa32a147 100644 --- a/aio-win32.c +++ b/aio-win32.c @@ -15,6 +15,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "block/block.h" #include "qemu/queue.h" diff --git a/arch_init.c b/arch_init.c index d1383b3c43..f6aba02cb2 100644 --- a/arch_init.c +++ b/arch_init.c @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include <stdint.h> +#include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "sysemu/arch_init.h" #include "hw/pci/pci.h" @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "block/aio.h" #include "block/thread-pool.h" @@ -24,6 +24,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "exec/cpu-common.h" #include "sysemu/kvm.h" @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "config-host.h" +#include "qemu/osdep.h" #include "qemu-common.h" #include "trace.h" #include "block/block_int.h" @@ -42,8 +42,6 @@ #include "block/throttle-groups.h" #ifdef CONFIG_BSD -#include <sys/types.h> -#include <sys/stat.h> #include <sys/ioctl.h> #include <sys/queue.h> #ifndef __DragonFly__ diff --git a/blockdev-nbd.c b/blockdev-nbd.c index 9d6a21c33d..efc31a462c 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -9,6 +9,7 @@ * later. See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "sysemu/blockdev.h" #include "sysemu/block-backend.h" #include "hw/block/block.h" diff --git a/blockdev.c b/blockdev.c index be4ca44ab2..e1b6b0f0e1 100644 --- a/blockdev.c +++ b/blockdev.c @@ -30,6 +30,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "hw/block/block.h" diff --git a/blockjob.c b/blockjob.c index a69214254c..a402181835 100644 --- a/blockjob.c +++ b/blockjob.c @@ -23,7 +23,7 @@ * THE SOFTWARE. */ -#include "config-host.h" +#include "qemu/osdep.h" #include "qemu-common.h" #include "trace.h" #include "block/block.h" diff --git a/bootdevice.c b/bootdevice.c index 3cdc0d7b22..1ee7b117de 100644 --- a/bootdevice.c +++ b/bootdevice.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "qapi/visitor.h" #include "qemu/error-report.h" @@ -17,12 +17,12 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "sysemu/bt.h" #include "qemu/main-loop.h" #ifndef _WIN32 -# include <errno.h> # include <sys/ioctl.h> # include <sys/uio.h> # ifdef CONFIG_BLUEZ @@ -17,6 +17,7 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "sysemu/bt.h" #include "hw/bt.h" diff --git a/device-hotplug.c b/device-hotplug.c index 68b94967c5..9a7cd669d5 100644 --- a/device-hotplug.c +++ b/device-hotplug.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/boards.h" #include "sysemu/block-backend.h" diff --git a/device_tree.c b/device_tree.c index a9f5f8e598..b1ad836073 100644 --- a/device_tree.c +++ b/device_tree.c @@ -11,12 +11,7 @@ * */ -#include <stdio.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <unistd.h> -#include <stdlib.h> +#include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/error-report.h" @@ -1,9 +1,8 @@ /* General "disassemble this chunk" code. Used for debugging. */ -#include "config.h" +#include "qemu/osdep.h" #include "qemu-common.h" #include "disas/bfd.h" #include "elf.h" -#include <errno.h> #include "cpu.h" #include "disas/disas.h" diff --git a/dma-helpers.c b/dma-helpers.c index 4faec5d0ca..4ad0bca67e 100644 --- a/dma-helpers.c +++ b/dma-helpers.c @@ -7,6 +7,7 @@ * (GNU GPL), version 2 or later. */ +#include "qemu/osdep.h" #include "sysemu/block-backend.h" #include "sysemu/dma.h" #include "trace.h" @@ -11,6 +11,7 @@ * */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "elf.h" #include "cpu.h" @@ -22,7 +23,6 @@ #include "sysemu/sysemu.h" #include "sysemu/memory_mapping.h" #include "sysemu/cpus.h" -#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qmp-commands.h" diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 162c21122c..cfa9787d8d 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -82,12 +82,11 @@ this code that are retained. /* softfloat (and in particular the code in softfloat-specialize.h) is * target-dependent and needs the TARGET_* macros. */ -#include "config.h" +#include "qemu/osdep.h" #include "fpu/softfloat.h" /* We only need stdlib for abort() */ -#include <stdlib.h> /*---------------------------------------------------------------------------- | Primitive arithmetic functions, including multi-word arithmetic, and @@ -16,16 +16,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" +#include "qemu/osdep.h" #include "qemu-common.h" #ifdef CONFIG_USER_ONLY -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <string.h> -#include <errno.h> -#include <unistd.h> -#include <fcntl.h> #include "qemu.h" #else @@ -13,6 +13,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ +#include "qemu/osdep.h" #include "hmp.h" #include "net/net.h" #include "net/eth.h" diff --git a/iohandler.c b/iohandler.c index eb68083559..0abb4a7e7a 100644 --- a/iohandler.c +++ b/iohandler.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -#include "config-host.h" +#include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/queue.h" #include "block/aio.h" @@ -25,6 +25,7 @@ * splitted out ioport related stuffs from vl.c. */ +#include "qemu/osdep.h" #include "exec/ioport.h" #include "trace.h" #include "exec/memory.h" diff --git a/iothread.c b/iothread.c index 1b8c2bbecb..f183d380e6 100644 --- a/iothread.c +++ b/iothread.c @@ -11,6 +11,7 @@ * */ +#include "qemu/osdep.h" #include "qom/object.h" #include "qom/object_interfaces.h" #include "qemu/module.h" @@ -13,10 +13,9 @@ * */ -#include <sys/types.h> +#include "qemu/osdep.h" #include <sys/ioctl.h> #include <sys/mman.h> -#include <stdarg.h> #include <linux/kvm.h> diff --git a/kvm-stub.c b/kvm-stub.c index dc97a5edf1..b962b24831 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -10,6 +10,7 @@ * */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "hw/hw.h" #include "cpu.h" diff --git a/main-loop.c b/main-loop.c index 5877615387..19beae76ad 100644 --- a/main-loop.c +++ b/main-loop.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/timer.h" #include "qemu/sockets.h" // struct in_addr needed for libslirp.h @@ -13,6 +13,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ +#include "qemu/osdep.h" #include "exec/memory.h" #include "exec/address-spaces.h" #include "exec/ioport.h" @@ -21,7 +22,6 @@ #include "qemu/error-report.h" #include "qom/object.h" #include "trace.h" -#include <assert.h> #include "exec/memory-internal.h" #include "exec/ram_addr.h" diff --git a/memory_mapping.c b/memory_mapping.c index 36d6b26046..04db3ac7fa 100644 --- a/memory_mapping.c +++ b/memory_mapping.c @@ -11,6 +11,7 @@ * */ +#include "qemu/osdep.h" #include <glib.h> #include "qemu-common.h" diff --git a/module-common.c b/module-common.c index 50c67500b1..0a3cb8aeab 100644 --- a/module-common.c +++ b/module-common.c @@ -1,4 +1,4 @@ -#include "config-host.h" +#include "qemu/osdep.h" #include "qemu/module.h" void qemu_module_dummy(void) @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include <dirent.h> #include "hw/hw.h" #include "monitor/qdev.h" @@ -59,7 +60,6 @@ #include "qapi/qmp/json-streamer.h" #include "qapi/qmp/json-parser.h" #include <qom/object_interfaces.h> -#include "qemu/osdep.h" #include "cpu.h" #include "trace.h" #include "trace/control.h" diff --git a/nbd/client.c b/nbd/client.c index 83df7ba378..f07cb4822d 100644 --- a/nbd/client.c +++ b/nbd/client.c @@ -16,6 +16,7 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ +#include "qemu/osdep.h" #include "nbd-internal.h" static int nbd_errno_to_system_errno(int err) diff --git a/nbd/common.c b/nbd/common.c index 7b089b0f3b..178d4a7ff2 100644 --- a/nbd/common.c +++ b/nbd/common.c @@ -16,6 +16,7 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ +#include "qemu/osdep.h" #include "nbd-internal.h" ssize_t nbd_wr_sync(int fd, void *buffer, size_t size, bool do_read) diff --git a/nbd/server.c b/nbd/server.c index 1ec79cf411..43135306b4 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -16,6 +16,7 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ +#include "qemu/osdep.h" #include "nbd-internal.h" static int system_errno_to_nbd_errno(int err) @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "sysemu/numa.h" #include "exec/cpu-common.h" #include "qemu/bitmap.h" diff --git a/os-posix.c b/os-posix.c index 87e2a1696d..cce62ed92b 100644 --- a/os-posix.c +++ b/os-posix.c @@ -23,10 +23,7 @@ * THE SOFTWARE. */ -#include <unistd.h> -#include <fcntl.h> -#include <signal.h> -#include <sys/types.h> +#include "qemu/osdep.h" #include <sys/wait.h> /*needed for MAP_POPULATE before including qemu-options.h */ #include <sys/mman.h> @@ -35,7 +32,6 @@ #include <libgen.h> /* Needed early for CONFIG_BSD etc. */ -#include "config-host.h" #include "sysemu/sysemu.h" #include "net/slirp.h" #include "qemu-options.h" diff --git a/os-win32.c b/os-win32.c index cc09196d8b..ae9857448f 100644 --- a/os-win32.c +++ b/os-win32.c @@ -22,14 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include <windows.h> #include <mmsystem.h> -#include <unistd.h> -#include <fcntl.h> -#include <time.h> -#include <errno.h> -#include <sys/time.h> -#include "config-host.h" #include "sysemu/sysemu.h" #include "qemu-options.h" diff --git a/page_cache.c b/page_cache.c index a9eb0769b3..cb8a69e964 100644 --- a/page_cache.c +++ b/page_cache.c @@ -12,13 +12,7 @@ * */ -#include <stdint.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <sys/time.h> -#include <sys/types.h> -#include <stdbool.h> +#include "qemu/osdep.h" #include <glib.h> #include "qemu-common.h" diff --git a/qdev-monitor.c b/qdev-monitor.c index 3ce47109e3..81e3ff34a9 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -17,6 +17,7 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#include "qemu/osdep.h" #include "hw/qdev.h" #include "hw/sysbus.h" #include "monitor/monitor.h" diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c index 36eb3bcfd6..830fb9e269 100644 --- a/qemu-bridge-helper.c +++ b/qemu-bridge-helper.c @@ -13,19 +13,10 @@ * */ -#include "config-host.h" - -#include <stdio.h> -#include <errno.h> -#include <fcntl.h> -#include <unistd.h> -#include <string.h> -#include <stdlib.h> -#include <stdbool.h> -#include <ctype.h> +#include "qemu/osdep.h" + #include <glib.h> -#include <sys/types.h> #include <sys/ioctl.h> #include <sys/socket.h> #include <sys/un.h> diff --git a/qemu-char.c b/qemu-char.c index 1605b30c33..927c47e503 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "monitor/monitor.h" #include "sysemu/sysemu.h" @@ -37,11 +38,6 @@ #include "io/channel-file.h" #include "io/channel-tls.h" -#include <unistd.h> -#include <fcntl.h> -#include <time.h> -#include <errno.h> -#include <sys/time.h> #include <zlib.h> #ifndef _WIN32 @@ -58,7 +54,6 @@ #include <netdb.h> #include <sys/select.h> #ifdef CONFIG_BSD -#include <sys/stat.h> #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #include <dev/ppbus/ppi.h> #include <dev/ppbus/ppbconf.h> @@ -72,7 +67,6 @@ #include <linux/parport.h> #endif #ifdef __sun__ -#include <sys/stat.h> #include <sys/ethernet.h> #include <sys/sockio.h> #include <netinet/arp.h> diff --git a/qemu-nbd.c b/qemu-nbd.c index ede4a54d4e..d374015125 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -16,6 +16,7 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "sysemu/block-backend.h" #include "block/block_int.h" @@ -27,15 +28,11 @@ #include "qapi/util.h" #include "qapi/qmp/qstring.h" -#include <stdarg.h> -#include <stdio.h> #include <getopt.h> -#include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <netinet/tcp.h> #include <arpa/inet.h> -#include <signal.h> #include <libgen.h> #include <pthread.h> diff --git a/qemu-seccomp.c b/qemu-seccomp.c index c831fe83ad..2866e3c2a6 100644 --- a/qemu-seccomp.c +++ b/qemu-seccomp.c @@ -12,7 +12,7 @@ * Contributions after 2012-01-13 are licensed under the terms of the * GNU GPL, version 2 or (at your option) any later version. */ -#include <stdio.h> +#include "qemu/osdep.h" #include <seccomp.h> #include "sysemu/seccomp.h" diff --git a/qemu-timer.c b/qemu-timer.c index f16e422837..e98ecc9733 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qemu/main-loop.h" #include "qemu/timer.h" #include "sysemu/replay.h" @@ -11,8 +11,8 @@ * */ +#include "qemu/osdep.h" #include <qapi/qmp/qstring.h> -#include <stdbool.h> #include <glib.h> #include <qjson.h> #include <qemu/module.h> @@ -13,6 +13,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "monitor/monitor.h" #include "sysemu/sysemu.h" @@ -11,6 +11,7 @@ * */ +#include "qemu/osdep.h" #include "sysemu/qtest.h" #include "hw/qdev.h" #include "sysemu/char.h" diff --git a/replay/replay-events.c b/replay/replay-events.c index 402f644067..2628109ed8 100644 --- a/replay/replay-events.c +++ b/replay/replay-events.c @@ -9,6 +9,7 @@ * */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/error-report.h" #include "sysemu/replay.h" diff --git a/replay/replay-input.c b/replay/replay-input.c index bc15f592dc..4270ca1837 100644 --- a/replay/replay-input.c +++ b/replay/replay-input.c @@ -9,6 +9,7 @@ * */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "sysemu/replay.h" #include "replay-internal.h" diff --git a/replay/replay-internal.c b/replay/replay-internal.c index 35cff44a36..5835e8def3 100644 --- a/replay/replay-internal.c +++ b/replay/replay-internal.c @@ -9,6 +9,7 @@ * */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "sysemu/replay.h" #include "replay-internal.h" diff --git a/replay/replay-time.c b/replay/replay-time.c index 6d06951f5e..fffe072c55 100644 --- a/replay/replay-time.c +++ b/replay/replay-time.c @@ -9,6 +9,7 @@ * */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "sysemu/replay.h" #include "replay-internal.h" diff --git a/replay/replay.c b/replay/replay.c index e4673b3d92..9cac178697 100644 --- a/replay/replay.c +++ b/replay/replay.c @@ -9,6 +9,7 @@ * */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "sysemu/replay.h" #include "replay-internal.h" diff --git a/spice-qemu-char.c b/spice-qemu-char.c index 8951d7ca37..7c1f4385bf 100644 --- a/spice-qemu-char.c +++ b/spice-qemu-char.c @@ -1,11 +1,10 @@ -#include "config-host.h" +#include "qemu/osdep.h" #include "trace.h" #include "ui/qemu-spice.h" #include "sysemu/char.h" #include <spice.h> #include <spice/protocol.h> -#include "qemu/osdep.h" typedef struct SpiceCharDriver { CharDriverState* chr; diff --git a/tcg-runtime.c b/tcg-runtime.c index 9daba6945e..ea2ad649cb 100644 --- a/tcg-runtime.c +++ b/tcg-runtime.c @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include <stdint.h> +#include "qemu/osdep.h" #include "qemu/host-utils.h" /* This file is compiled once, and thus we can't include the standard @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" +#include "qemu/osdep.h" /* Defining NDEBUG disables assertions (which makes the code faster). */ #if !defined(CONFIG_DEBUG_TCG) && !defined(NDEBUG) diff --git a/thread-pool.c b/thread-pool.c index 402c778b47..03ba0b02a4 100644 --- a/thread-pool.c +++ b/thread-pool.c @@ -14,10 +14,10 @@ * Contributions after 2012-01-13 are licensed under the terms of the * GNU GPL, version 2 or (at your option) any later version. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/queue.h" #include "qemu/thread.h" -#include "qemu/osdep.h" #include "qemu/coroutine.h" #include "trace.h" #include "block/thread-pool.h" @@ -16,9 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> +#include "qemu/osdep.h" #include "qemu.h" #include "exec/user/thunk.h" @@ -11,7 +11,7 @@ * * Based on net.c */ -#include "config-host.h" +#include "qemu/osdep.h" #include "qapi/qmp/qerror.h" #include "sysemu/tpm_backend.h" diff --git a/trace/control.c b/trace/control.c index 84ea840892..20d3370bf8 100644 --- a/trace/control.c +++ b/trace/control.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "trace/control.h" #ifdef CONFIG_TRACE_SIMPLE #include "trace/simple.h" diff --git a/trace/ftrace.c b/trace/ftrace.c index a7ae371e6f..e953922f5b 100644 --- a/trace/ftrace.c +++ b/trace/ftrace.c @@ -9,10 +9,7 @@ * */ -#include <stdio.h> -#include <string.h> -#include <fcntl.h> -#include <limits.h> +#include "qemu/osdep.h" #include "trace.h" #include "trace/control.h" diff --git a/trace/qmp.c b/trace/qmp.c index 0b19489528..6320b4b3b1 100644 --- a/trace/qmp.c +++ b/trace/qmp.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "qemu/typedefs.h" #include "qmp-commands.h" #include "trace/control.h" diff --git a/trace/simple.c b/trace/simple.c index e8594cd00d..3fdcc82263 100644 --- a/trace/simple.c +++ b/trace/simple.c @@ -8,12 +8,8 @@ * */ -#include <stdlib.h> -#include <stdint.h> -#include <stdio.h> -#include <time.h> +#include "qemu/osdep.h" #ifndef _WIN32 -#include <signal.h> #include <pthread.h> #endif #include "qemu/timer.h" diff --git a/user-exec.c b/user-exec.c index 8ad89a466b..d8d597bafe 100644 --- a/user-exec.c +++ b/user-exec.c @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" +#include "qemu/osdep.h" #include "cpu.h" #include "disas/disas.h" #include "tcg.h" @@ -33,7 +33,6 @@ #undef ESI #undef EDI #undef EIP -#include <signal.h> #ifdef __linux__ #include <sys/ucontext.h> #endif diff --git a/util/log.c b/util/log.c index 46c88c93e2..2709e98f98 100644 --- a/util/log.c +++ b/util/log.c @@ -17,6 +17,7 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/log.h" #include "trace/control.h" @@ -21,14 +21,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include <unistd.h> -#include <fcntl.h> -#include <signal.h> -#include <time.h> -#include <errno.h> -#include <sys/time.h> +#include "qemu/osdep.h" -#include "config-host.h" #ifdef CONFIG_SECCOMP #include "sysemu/seccomp.h" @@ -113,7 +107,6 @@ int main(int argc, char **argv) #include "qemu/queue.h" #include "sysemu/cpus.h" #include "sysemu/arch_init.h" -#include "qemu/osdep.h" #include "ui/qemu-spice.h" #include "qapi/string-input-visitor.h" |