diff options
author | Markus Armbruster <armbru@redhat.com> | 2018-02-01 12:18:29 +0100 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2018-02-09 05:05:11 +0100 |
commit | 8f0a3716e40cf479ebdc1cf5a34b8d500c05adff (patch) | |
tree | be88d99c3c769aaf06c0e68d587f1a86b7ae180f /hw | |
parent | d8e39b70625d4ba1e998439d1a077b4b978930e7 (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 change
to target/s390x/gen-features.c manually reverted, and blank lines
around deletions collapsed.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180201111846.21846-3-armbru@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r-- | hw/block/vhost-user-blk.c | 1 | ||||
-rw-r--r-- | hw/nvram/eeprom_at24c.c | 3 | ||||
-rw-r--r-- | hw/tpm/tpm_emulator.c | 5 | ||||
-rw-r--r-- | hw/tpm/tpm_int.h | 2 | ||||
-rw-r--r-- | hw/tpm/tpm_ioctl.h | 2 | ||||
-rw-r--r-- | hw/xtensa/xtensa_memory.h | 1 |
6 files changed, 1 insertions, 13 deletions
diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c index b53b4c9c57..f840f07dfe 100644 --- a/hw/block/vhost-user-blk.c +++ b/hw/block/vhost-user-blk.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "qemu/typedefs.h" #include "qemu/cutils.h" #include "qom/object.h" #include "hw/qdev-core.h" diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c index efa3621ac6..22183f5360 100644 --- a/hw/nvram/eeprom_at24c.c +++ b/hw/nvram/eeprom_at24c.c @@ -7,9 +7,8 @@ * the LICENSE file in the top-level directory. */ -#include <string.h> - #include "qemu/osdep.h" + #include "qapi/error.h" #include "hw/hw.h" #include "hw/i2c/i2c.h" diff --git a/hw/tpm/tpm_emulator.c b/hw/tpm/tpm_emulator.c index 710a9ec718..b787aee13b 100644 --- a/hw/tpm/tpm_emulator.c +++ b/hw/tpm/tpm_emulator.c @@ -40,11 +40,6 @@ #include "qapi/clone-visitor.h" #include "chardev/char-fe.h" -#include <fcntl.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <stdio.h> - #define DEBUG_TPM 0 #define DPRINTF(fmt, ...) do { \ diff --git a/hw/tpm/tpm_int.h b/hw/tpm/tpm_int.h index abbca5191a..a4c77fbd7e 100644 --- a/hw/tpm/tpm_int.h +++ b/hw/tpm/tpm_int.h @@ -12,8 +12,6 @@ #ifndef TPM_TPM_INT_H #define TPM_TPM_INT_H -#include "qemu/osdep.h" - #define TPM_STANDARD_CMDLINE_OPTS \ { \ .name = "type", \ diff --git a/hw/tpm/tpm_ioctl.h b/hw/tpm/tpm_ioctl.h index 54c8d345ad..59a0b0595d 100644 --- a/hw/tpm/tpm_ioctl.h +++ b/hw/tpm/tpm_ioctl.h @@ -8,9 +8,7 @@ #ifndef _TPM_IOCTL_H_ #define _TPM_IOCTL_H_ -#include <stdint.h> #include <sys/uio.h> -#include <sys/types.h> #include <sys/ioctl.h> /* diff --git a/hw/xtensa/xtensa_memory.h b/hw/xtensa/xtensa_memory.h index cab4d172d4..e9aa08749d 100644 --- a/hw/xtensa/xtensa_memory.h +++ b/hw/xtensa/xtensa_memory.h @@ -28,7 +28,6 @@ #ifndef _XTENSA_MEMORY_H #define _XTENSA_MEMORY_H -#include "qemu/osdep.h" #include "qemu-common.h" #include "cpu.h" #include "exec/memory.h" |