jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

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>

Markus Armbruster 8f0a3716 d8e39b70

+9 -51
-1
block/parallels.h
··· 32 32 #ifndef BLOCK_PARALLELS_H 33 33 #define BLOCK_PARALLELS_H 34 34 #include "qemu/coroutine.h" 35 - #include "qemu/typedefs.h" 36 35 37 36 #define HEADS_NUMBER 16 38 37 #define SEC_IN_CYL 32
-1
hw/block/vhost-user-blk.c
··· 19 19 #include "qemu/osdep.h" 20 20 #include "qapi/error.h" 21 21 #include "qemu/error-report.h" 22 - #include "qemu/typedefs.h" 23 22 #include "qemu/cutils.h" 24 23 #include "qom/object.h" 25 24 #include "hw/qdev-core.h"
+1 -2
hw/nvram/eeprom_at24c.c
··· 7 7 * the LICENSE file in the top-level directory. 8 8 */ 9 9 10 - #include <string.h> 10 + #include "qemu/osdep.h" 11 11 12 - #include "qemu/osdep.h" 13 12 #include "qapi/error.h" 14 13 #include "hw/hw.h" 15 14 #include "hw/i2c/i2c.h"
-5
hw/tpm/tpm_emulator.c
··· 40 40 #include "qapi/clone-visitor.h" 41 41 #include "chardev/char-fe.h" 42 42 43 - #include <fcntl.h> 44 - #include <sys/types.h> 45 - #include <sys/stat.h> 46 - #include <stdio.h> 47 - 48 43 #define DEBUG_TPM 0 49 44 50 45 #define DPRINTF(fmt, ...) do { \
-2
hw/tpm/tpm_int.h
··· 12 12 #ifndef TPM_TPM_INT_H 13 13 #define TPM_TPM_INT_H 14 14 15 - #include "qemu/osdep.h" 16 - 17 15 #define TPM_STANDARD_CMDLINE_OPTS \ 18 16 { \ 19 17 .name = "type", \
-2
hw/tpm/tpm_ioctl.h
··· 8 8 #ifndef _TPM_IOCTL_H_ 9 9 #define _TPM_IOCTL_H_ 10 10 11 - #include <stdint.h> 12 11 #include <sys/uio.h> 13 - #include <sys/types.h> 14 12 #include <sys/ioctl.h> 15 13 16 14 /*
-1
hw/xtensa/xtensa_memory.h
··· 28 28 #ifndef _XTENSA_MEMORY_H 29 29 #define _XTENSA_MEMORY_H 30 30 31 - #include "qemu/osdep.h" 32 31 #include "qemu-common.h" 33 32 #include "cpu.h" 34 33 #include "exec/memory.h"
-2
include/exec/tb-lookup.h
··· 7 7 #ifndef EXEC_TB_LOOKUP_H 8 8 #define EXEC_TB_LOOKUP_H 9 9 10 - #include "qemu/osdep.h" 11 - 12 10 #ifdef NEED_CPU_H 13 11 #include "cpu.h" 14 12 #else
-1
include/hw/intc/xlnx-pmu-iomod-intc.h
··· 25 25 #ifndef XLNX_PMU_IO_INTC_H 26 26 #define XLNX_PMU_IO_INTC_H 27 27 28 - #include "qemu/osdep.h" 29 28 #include "hw/sysbus.h" 30 29 #include "hw/register.h" 31 30
-1
include/hw/intc/xlnx-zynqmp-ipi.h
··· 25 25 #ifndef XLNX_ZYNQMP_IPI_H 26 26 #define XLNX_ZYNQMP_IPI_H 27 27 28 - #include "qemu/osdep.h" 29 28 #include "hw/sysbus.h" 30 29 #include "hw/register.h" 31 30
-1
include/hw/nvram/fw_cfg.h
··· 1 1 #ifndef FW_CFG_H 2 2 #define FW_CFG_H 3 3 4 - #include "qemu/typedefs.h" 5 4 #include "exec/hwaddr.h" 6 5 #include "hw/nvram/fw_cfg_keys.h" 7 6 #include "hw/sysbus.h"
-1
include/hw/pci-bridge/simba.h
··· 24 24 * THE SOFTWARE. 25 25 */ 26 26 27 - #include "qemu/osdep.h" 28 27 #include "hw/pci/pci_bridge.h" 29 28 30 29
-2
include/hw/xtensa/xtensa-isa.h
··· 25 25 #ifndef XTENSA_LIBISA_H 26 26 #define XTENSA_LIBISA_H 27 27 28 - #include <stdint.h> 29 - 30 28 #ifdef __cplusplus 31 29 extern "C" { 32 30 #endif
-1
include/qapi/clone-visitor.h
··· 11 11 #ifndef QAPI_CLONE_VISITOR_H 12 12 #define QAPI_CLONE_VISITOR_H 13 13 14 - #include "qemu/typedefs.h" 15 14 #include "qapi/visitor.h" 16 15 #include "qapi-visit.h" 17 16
-2
include/sysemu/hvf.h
··· 12 12 #ifndef _HVF_H 13 13 #define _HVF_H 14 14 15 - #include "config-host.h" 16 - #include "qemu/osdep.h" 17 15 #include "qemu-common.h" 18 16 #include "qemu/bitops.h" 19 17 #include "exec/memory.h"
-1
include/ui/console.h
··· 5 5 #include "qom/object.h" 6 6 #include "qapi/qmp/qdict.h" 7 7 #include "qemu/notify.h" 8 - #include "qemu/typedefs.h" 9 8 #include "qapi-types.h" 10 9 #include "qemu/error-report.h" 11 10 #include "qapi/error.h"
-3
io/channel-websock.c
··· 26 26 #include "trace.h" 27 27 #include "qemu/iov.h" 28 28 29 - #include <time.h> 30 - 31 - 32 29 /* Max amount to allow in rawinput/encoutput buffers */ 33 30 #define QIO_CHANNEL_WEBSOCK_MAX_BUFFER 8192 34 31
-1
linux-user/syscall.c
··· 44 44 #include <sys/shm.h> 45 45 #include <sys/sem.h> 46 46 #include <sys/statfs.h> 47 - #include <time.h> 48 47 #include <utime.h> 49 48 #include <sys/sysinfo.h> 50 49 #include <sys/signalfd.h>
-2
scsi/pr-helper.h
··· 26 26 #ifndef QEMU_PR_HELPER_H 27 27 #define QEMU_PR_HELPER_H 1 28 28 29 - #include <stdint.h> 30 - 31 29 #define PR_HELPER_CDB_SIZE 16 32 30 #define PR_HELPER_SENSE_SIZE 96 33 31 #define PR_HELPER_DATA_SIZE 8192
-1
target/i386/hvf/vmx.h
··· 25 25 #ifndef VMX_H 26 26 #define VMX_H 27 27 28 - #include <stdint.h> 29 28 #include <Hypervisor/hv.h> 30 29 #include <Hypervisor/hv_vmx.h> 31 30 #include "vmcs.h"
-3
target/i386/hvf/x86hvf.c
··· 29 29 30 30 #include "hw/i386/apic_internal.h" 31 31 32 - #include <stdio.h> 33 - #include <stdlib.h> 34 32 #include <Hypervisor/hv.h> 35 33 #include <Hypervisor/hv_vmx.h> 36 - #include <stdint.h> 37 34 38 35 void hvf_set_segment(struct CPUState *cpu, struct vmx_segment *vmx_seg, 39 36 SegmentCache *qseg, bool is_tr)
+1
target/xtensa/core-dc232b/xtensa-modules.c
··· 18 18 Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 19 19 02110-1301, USA. */ 20 20 21 + #include "qemu/osdep.h" 21 22 #include "xtensa-isa.h" 22 23 #include "xtensa-isa-internal.h" 23 24
+1
target/xtensa/core-dc233c/xtensa-modules.c
··· 21 21 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 22 22 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ 23 23 24 + #include "qemu/osdep.h" 24 25 #include "xtensa-isa.h" 25 26 #include "xtensa-isa-internal.h" 26 27
+1
target/xtensa/core-de212/xtensa-modules.c
··· 21 21 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 22 22 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ 23 23 24 + #include "qemu/osdep.h" 24 25 #include "xtensa-isa.h" 25 26 #include "xtensa-isa-internal.h" 26 27
+1
target/xtensa/core-fsf/xtensa-modules.c
··· 18 18 Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 19 19 02110-1301, USA. */ 20 20 21 + #include "qemu/osdep.h" 21 22 #include "xtensa-isa.h" 22 23 #include "xtensa-isa-internal.h" 23 24
+1
target/xtensa/core-sample_controller/xtensa-modules.c
··· 21 21 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 22 22 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ 23 23 24 + #include "qemu/osdep.h" 24 25 #include "xtensa-isa.h" 25 26 #include "xtensa-isa-internal.h" 26 27
+1 -3
target/xtensa/xtensa-isa.c
··· 22 22 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 23 23 */ 24 24 25 - #include <stdio.h> 26 - #include <stdlib.h> 27 - #include <string.h> 25 + #include "qemu/osdep.h" 28 26 #include "xtensa-isa.h" 29 27 #include "xtensa-isa-internal.h" 30 28
+1 -9
tests/migration/stress.c
··· 17 17 * License along with this library; if not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 20 - #include <stdio.h> 20 + #include "qemu/osdep.h" 21 21 #include <getopt.h> 22 - #include <string.h> 23 - #include <stdlib.h> 24 - #include <errno.h> 25 - #include <unistd.h> 26 22 #include <sys/reboot.h> 27 23 #include <sys/syscall.h> 28 24 #include <linux/random.h> 29 - #include <sys/time.h> 30 25 #include <pthread.h> 31 - #include <fcntl.h> 32 26 #include <sys/mount.h> 33 - #include <sys/stat.h> 34 - #include <sys/mman.h> 35 27 36 28 const char *argv0; 37 29
+1 -1
tests/ptimer-test.c
··· 8 8 * 9 9 */ 10 10 11 + #include "qemu/osdep.h" 11 12 #include <glib/gprintf.h> 12 13 13 - #include "qemu/osdep.h" 14 14 #include "qemu/main-loop.h" 15 15 #include "hw/ptimer.h" 16 16
-2
trace/control-internal.h
··· 10 10 #ifndef TRACE__CONTROL_INTERNAL_H 11 11 #define TRACE__CONTROL_INTERNAL_H 12 12 13 - #include <stddef.h> /* size_t */ 14 - 15 13 #include "qom/cpu.h" 16 14 17 15