From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59524) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejP1L-0001N3-55 for qemu-devel@nongnu.org; Wed, 07 Feb 2018 07:40:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ejP1I-0004f6-4T for qemu-devel@nongnu.org; Wed, 07 Feb 2018 07:40:15 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:50742 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ejP1H-0004dd-VL for qemu-devel@nongnu.org; Wed, 07 Feb 2018 07:40:12 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 277BA7D83B for ; Wed, 7 Feb 2018 12:40:11 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-148.ams2.redhat.com [10.36.116.148]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BC8B3AE7C9 for ; Wed, 7 Feb 2018 12:40:10 +0000 (UTC) From: Markus Armbruster Date: Wed, 7 Feb 2018 13:39:52 +0100 Message-Id: <20180207124009.12376-4-armbru@redhat.com> In-Reply-To: <20180207124009.12376-1-armbru@redhat.com> References: <20180207124009.12376-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 03/20] Clean up includes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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=C3=A9 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 | 4 ++-- trace/control-internal.h | 2 -- 30 files changed, 10 insertions(+), 52 deletions(-) diff --git a/block/parallels.h b/block/parallels.h index 4b044079ef..5aa101cfc8 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" =20 #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 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. */ =20 -#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 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" =20 -#include -#include -#include -#include - #define DEBUG_TPM 0 =20 #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 =20 -#include "qemu/osdep.h" - #define TPM_STANDARD_CMDLINE_OPTS \ { \ .name =3D "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_ =20 -#include #include -#include #include =20 /* 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 =20 -#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 296138591a..492cb68289 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 =20 -#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 1fdba73b9f..01c9d040b8 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 =20 -#include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/register.h" =20 diff --git a/include/hw/intc/xlnx-zynqmp-ipi.h b/include/hw/intc/xlnx-zyn= qmp-ipi.h index 4afa4ff313..866c719c6f 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 =20 -#include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/register.h" =20 diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index 7ccbae5fba..b2259cc4a3 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 =20 -#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 fac56ab1cf..e13ba27d0b 100644 --- a/include/hw/pci-bridge/simba.h +++ b/include/hw/pci-bridge/simba.h @@ -24,7 +24,6 @@ * THE SOFTWARE. */ =20 -#include "qemu/osdep.h" #include "hw/pci/pci_bridge.h" =20 =20 diff --git a/include/hw/xtensa/xtensa-isa.h b/include/hw/xtensa/xtensa-is= a.h index 353f82ba25..bd68ada640 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 =20 -#include - #ifdef __cplusplus extern "C" { #endif diff --git a/include/qapi/clone-visitor.h b/include/qapi/clone-visitor.h index a4915c7d57..b119d3daa9 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 =20 -#include "qemu/typedefs.h" #include "qapi/visitor.h" #include "qapi-visit.h" =20 diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h index e4e43f6468..241118845c 100644 --- a/include/sysemu/hvf.h +++ b/include/sysemu/hvf.h @@ -12,8 +12,6 @@ #ifndef _HVF_H #define _HVF_H =20 -#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 de57e8363a..4c5d2102b6 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 87ebdebfc0..7fd6bb68ba 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -26,9 +26,6 @@ #include "trace.h" #include "qemu/iov.h" =20 -#include - - /* Max amount to allow in rawinput/encoutput buffers */ #define QIO_CHANNEL_WEBSOCK_MAX_BUFFER 8192 =20 diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 74378947f0..779e590726 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -48,7 +48,6 @@ int __clone2(int (*fn)(void *), void *child_stack_base, #include #include #include -#include #include #include #include diff --git a/scsi/pr-helper.h b/scsi/pr-helper.h index 96c50a9e5f..096d1f1df6 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 =20 -#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 9dfcd2f2eb..f3e6e86999 100644 --- a/target/i386/hvf/vmx.h +++ b/target/i386/hvf/vmx.h @@ -22,7 +22,6 @@ #ifndef VMX_H #define VMX_H =20 -#include #include #include #include "vmcs.h" diff --git a/target/i386/hvf/x86hvf.c b/target/i386/hvf/x86hvf.c index 7803e09a28..6c88939b96 100644 --- a/target/i386/hvf/x86hvf.c +++ b/target/i386/hvf/x86hvf.c @@ -29,11 +29,8 @@ =20 #include "hw/i386/apic_internal.h" =20 -#include -#include #include #include -#include =20 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/c= ore-dc232b/xtensa-modules.c index 0af43c84bb..d322c3f52a 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. */ =20 +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h" =20 diff --git a/target/xtensa/core-dc233c/xtensa-modules.c b/target/xtensa/c= ore-dc233c/xtensa-modules.c index 8a41e73659..7c20f82349 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. */ =20 +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h" =20 diff --git a/target/xtensa/core-de212/xtensa-modules.c b/target/xtensa/co= re-de212/xtensa-modules.c index 21f3bd8797..ef7674de3a 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. */ =20 +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h" =20 diff --git a/target/xtensa/core-fsf/xtensa-modules.c b/target/xtensa/core= -fsf/xtensa-modules.c index 9621f5142a..f7de2dec15 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. */ =20 +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h" =20 diff --git a/target/xtensa/core-sample_controller/xtensa-modules.c b/targ= et/xtensa/core-sample_controller/xtensa-modules.c index 39810e532a..fba41b99ae 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. */ =20 +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h" =20 diff --git a/target/xtensa/xtensa-isa.c b/target/xtensa/xtensa-isa.c index e0076a694f..630b4f9da1 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. */ =20 -#include -#include -#include +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h" =20 diff --git a/tests/migration/stress.c b/tests/migration/stress.c index cf8ce8b16d..49a03aab7b 100644 --- a/tests/migration/stress.c +++ b/tests/migration/stress.c @@ -17,21 +17,13 @@ * License along with this library; if not, see . */ =20 -#include +#include "qemu/osdep.h" #include -#include -#include -#include -#include #include #include #include -#include #include -#include #include -#include -#include =20 const char *argv0; =20 diff --git a/tests/ptimer-test.c b/tests/ptimer-test.c index 5d1a2a8188..41488896f7 100644 --- a/tests/ptimer-test.c +++ b/tests/ptimer-test.c @@ -8,9 +8,9 @@ * */ =20 -#include - #include "qemu/osdep.h" +#include + #include "qemu/main-loop.h" #include "hw/ptimer.h" =20 diff --git a/trace/control-internal.h b/trace/control-internal.h index a9d395a587..c7fbe2d3bf 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 =20 -#include /* size_t */ - #include "qom/cpu.h" =20 =20 --=20 2.13.6