From 8f0a3716e40cf479ebdc1cf5a34b8d500c05adff Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 1 Feb 2018 12:18:29 +0100 Subject: Clean up includes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Markus Armbruster Message-Id: <20180201111846.21846-3-armbru@redhat.com> --- block/parallels.h | 1 - hw/block/vhost-user-blk.c | 1 - hw/nvram/eeprom_at24c.c | 3 +-- hw/tpm/tpm_emulator.c | 5 ----- hw/tpm/tpm_int.h | 2 -- hw/tpm/tpm_ioctl.h | 2 -- hw/xtensa/xtensa_memory.h | 1 - include/exec/tb-lookup.h | 2 -- include/hw/intc/xlnx-pmu-iomod-intc.h | 1 - include/hw/intc/xlnx-zynqmp-ipi.h | 1 - include/hw/nvram/fw_cfg.h | 1 - include/hw/pci-bridge/simba.h | 1 - include/hw/xtensa/xtensa-isa.h | 2 -- include/qapi/clone-visitor.h | 1 - include/sysemu/hvf.h | 2 -- include/ui/console.h | 1 - io/channel-websock.c | 3 --- linux-user/syscall.c | 1 - scsi/pr-helper.h | 2 -- target/i386/hvf/vmx.h | 1 - target/i386/hvf/x86hvf.c | 3 --- target/xtensa/core-dc232b/xtensa-modules.c | 1 + target/xtensa/core-dc233c/xtensa-modules.c | 1 + target/xtensa/core-de212/xtensa-modules.c | 1 + target/xtensa/core-fsf/xtensa-modules.c | 1 + target/xtensa/core-sample_controller/xtensa-modules.c | 1 + target/xtensa/xtensa-isa.c | 4 +--- tests/migration/stress.c | 10 +--------- tests/ptimer-test.c | 2 +- trace/control-internal.h | 2 -- 30 files changed, 9 insertions(+), 51 deletions(-) diff --git a/block/parallels.h b/block/parallels.h index 4b04407..5aa101c 100644 --- a/block/parallels.h +++ b/block/parallels.h @@ -32,7 +32,6 @@ #ifndef BLOCK_PARALLELS_H #define BLOCK_PARALLELS_H #include "qemu/coroutine.h" -#include "qemu/typedefs.h" #define HEADS_NUMBER 16 #define SEC_IN_CYL 32 diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c index b53b4c9..f840f07 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 efa3621..22183f5 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 - #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 710a9ec..b787aee 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 -#include -#include -#include - #define DEBUG_TPM 0 #define DPRINTF(fmt, ...) do { \ diff --git a/hw/tpm/tpm_int.h b/hw/tpm/tpm_int.h index abbca51..a4c77fb 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 54c8d34..59a0b05 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 #include -#include #include /* diff --git a/hw/xtensa/xtensa_memory.h b/hw/xtensa/xtensa_memory.h index cab4d17..e9aa087 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" diff --git a/include/exec/tb-lookup.h b/include/exec/tb-lookup.h index 2961385..492cb68 100644 --- a/include/exec/tb-lookup.h +++ b/include/exec/tb-lookup.h @@ -7,8 +7,6 @@ #ifndef EXEC_TB_LOOKUP_H #define EXEC_TB_LOOKUP_H -#include "qemu/osdep.h" - #ifdef NEED_CPU_H #include "cpu.h" #else diff --git a/include/hw/intc/xlnx-pmu-iomod-intc.h b/include/hw/intc/xlnx-pmu-iomod-intc.h index 1fdba73..01c9d04 100644 --- a/include/hw/intc/xlnx-pmu-iomod-intc.h +++ b/include/hw/intc/xlnx-pmu-iomod-intc.h @@ -25,7 +25,6 @@ #ifndef XLNX_PMU_IO_INTC_H #define XLNX_PMU_IO_INTC_H -#include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/register.h" diff --git a/include/hw/intc/xlnx-zynqmp-ipi.h b/include/hw/intc/xlnx-zynqmp-ipi.h index 4afa4ff..866c719 100644 --- a/include/hw/intc/xlnx-zynqmp-ipi.h +++ b/include/hw/intc/xlnx-zynqmp-ipi.h @@ -25,7 +25,6 @@ #ifndef XLNX_ZYNQMP_IPI_H #define XLNX_ZYNQMP_IPI_H -#include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/register.h" diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index 7ccbae5..b2259cc 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -1,7 +1,6 @@ #ifndef FW_CFG_H #define FW_CFG_H -#include "qemu/typedefs.h" #include "exec/hwaddr.h" #include "hw/nvram/fw_cfg_keys.h" #include "hw/sysbus.h" diff --git a/include/hw/pci-bridge/simba.h b/include/hw/pci-bridge/simba.h index fac56ab..e13ba27 100644 --- a/include/hw/pci-bridge/simba.h +++ b/include/hw/pci-bridge/simba.h @@ -24,7 +24,6 @@ * THE SOFTWARE. */ -#include "qemu/osdep.h" #include "hw/pci/pci_bridge.h" diff --git a/include/hw/xtensa/xtensa-isa.h b/include/hw/xtensa/xtensa-isa.h index 353f82b..bd68ada 100644 --- a/include/hw/xtensa/xtensa-isa.h +++ b/include/hw/xtensa/xtensa-isa.h @@ -25,8 +25,6 @@ #ifndef XTENSA_LIBISA_H #define XTENSA_LIBISA_H -#include - #ifdef __cplusplus extern "C" { #endif diff --git a/include/qapi/clone-visitor.h b/include/qapi/clone-visitor.h index a4915c7..b119d3d 100644 --- a/include/qapi/clone-visitor.h +++ b/include/qapi/clone-visitor.h @@ -11,7 +11,6 @@ #ifndef QAPI_CLONE_VISITOR_H #define QAPI_CLONE_VISITOR_H -#include "qemu/typedefs.h" #include "qapi/visitor.h" #include "qapi-visit.h" diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h index e4e43f6..2411188 100644 --- a/include/sysemu/hvf.h +++ b/include/sysemu/hvf.h @@ -12,8 +12,6 @@ #ifndef _HVF_H #define _HVF_H -#include "config-host.h" -#include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/bitops.h" #include "exec/memory.h" diff --git a/include/ui/console.h b/include/ui/console.h index de57e83..4c5d210 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -5,7 +5,6 @@ #include "qom/object.h" #include "qapi/qmp/qdict.h" #include "qemu/notify.h" -#include "qemu/typedefs.h" #include "qapi-types.h" #include "qemu/error-report.h" #include "qapi/error.h" diff --git a/io/channel-websock.c b/io/channel-websock.c index 87ebdeb..7fd6bb6 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -26,9 +26,6 @@ #include "trace.h" #include "qemu/iov.h" -#include - - /* Max amount to allow in rawinput/encoutput buffers */ #define QIO_CHANNEL_WEBSOCK_MAX_BUFFER 8192 diff --git a/linux-user/syscall.c b/linux-user/syscall.c index df1edf0..82b35a6 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #include diff --git a/scsi/pr-helper.h b/scsi/pr-helper.h index 96c50a9..096d1f1 100644 --- a/scsi/pr-helper.h +++ b/scsi/pr-helper.h @@ -26,8 +26,6 @@ #ifndef QEMU_PR_HELPER_H #define QEMU_PR_HELPER_H 1 -#include - #define PR_HELPER_CDB_SIZE 16 #define PR_HELPER_SENSE_SIZE 96 #define PR_HELPER_DATA_SIZE 8192 diff --git a/target/i386/hvf/vmx.h b/target/i386/hvf/vmx.h index 162a7d5..5dc52ec 100644 --- a/target/i386/hvf/vmx.h +++ b/target/i386/hvf/vmx.h @@ -25,7 +25,6 @@ #ifndef VMX_H #define VMX_H -#include #include #include #include "vmcs.h" diff --git a/target/i386/hvf/x86hvf.c b/target/i386/hvf/x86hvf.c index 7803e09..6c88939 100644 --- a/target/i386/hvf/x86hvf.c +++ b/target/i386/hvf/x86hvf.c @@ -29,11 +29,8 @@ #include "hw/i386/apic_internal.h" -#include -#include #include #include -#include void hvf_set_segment(struct CPUState *cpu, struct vmx_segment *vmx_seg, SegmentCache *qseg, bool is_tr) diff --git a/target/xtensa/core-dc232b/xtensa-modules.c b/target/xtensa/core-dc232b/xtensa-modules.c index 0af43c8..d322c3f 100644 --- a/target/xtensa/core-dc232b/xtensa-modules.c +++ b/target/xtensa/core-dc232b/xtensa-modules.c @@ -18,6 +18,7 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h" diff --git a/target/xtensa/core-dc233c/xtensa-modules.c b/target/xtensa/core-dc233c/xtensa-modules.c index 8a41e73..7c20f82 100644 --- a/target/xtensa/core-dc233c/xtensa-modules.c +++ b/target/xtensa/core-dc233c/xtensa-modules.c @@ -21,6 +21,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h" diff --git a/target/xtensa/core-de212/xtensa-modules.c b/target/xtensa/core-de212/xtensa-modules.c index 21f3bd8..ef7674d 100644 --- a/target/xtensa/core-de212/xtensa-modules.c +++ b/target/xtensa/core-de212/xtensa-modules.c @@ -21,6 +21,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h" diff --git a/target/xtensa/core-fsf/xtensa-modules.c b/target/xtensa/core-fsf/xtensa-modules.c index 9621f51..f7de2de 100644 --- a/target/xtensa/core-fsf/xtensa-modules.c +++ b/target/xtensa/core-fsf/xtensa-modules.c @@ -18,6 +18,7 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h" diff --git a/target/xtensa/core-sample_controller/xtensa-modules.c b/target/xtensa/core-sample_controller/xtensa-modules.c index 39810e5..fba41b9 100644 --- a/target/xtensa/core-sample_controller/xtensa-modules.c +++ b/target/xtensa/core-sample_controller/xtensa-modules.c @@ -21,6 +21,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h" diff --git a/target/xtensa/xtensa-isa.c b/target/xtensa/xtensa-isa.c index e0076a6..630b4f9 100644 --- a/target/xtensa/xtensa-isa.c +++ b/target/xtensa/xtensa-isa.c @@ -22,9 +22,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include -#include -#include +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h" diff --git a/tests/migration/stress.c b/tests/migration/stress.c index cf8ce8b..49a03aa 100644 --- a/tests/migration/stress.c +++ b/tests/migration/stress.c @@ -17,21 +17,13 @@ * License along with this library; if not, see . */ -#include +#include "qemu/osdep.h" #include -#include -#include -#include -#include #include #include #include -#include #include -#include #include -#include -#include const char *argv0; diff --git a/tests/ptimer-test.c b/tests/ptimer-test.c index 5d1a2a8..4148889 100644 --- a/tests/ptimer-test.c +++ b/tests/ptimer-test.c @@ -8,9 +8,9 @@ * */ +#include "qemu/osdep.h" #include -#include "qemu/osdep.h" #include "qemu/main-loop.h" #include "hw/ptimer.h" diff --git a/trace/control-internal.h b/trace/control-internal.h index a9d395a..c7fbe2d 100644 --- a/trace/control-internal.h +++ b/trace/control-internal.h @@ -10,8 +10,6 @@ #ifndef TRACE__CONTROL_INTERNAL_H #define TRACE__CONTROL_INTERNAL_H -#include /* size_t */ - #include "qom/cpu.h" -- cgit v1.1