[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/37] linux-user: Clean up includes
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 09/37] linux-user: Clean up includes |
Date: |
Tue, 26 Jan 2016 18:17:02 +0000 |
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 <address@hidden>
---
linux-user/arm/nwfpe/double_cpdo.c | 1 +
linux-user/arm/nwfpe/extended_cpdo.c | 1 +
linux-user/arm/nwfpe/fpa11.c | 2 +-
linux-user/arm/nwfpe/fpa11_cpdo.c | 1 +
linux-user/arm/nwfpe/fpa11_cpdt.c | 1 +
linux-user/arm/nwfpe/fpa11_cprt.c | 1 +
linux-user/arm/nwfpe/fpopcode.c | 1 +
linux-user/arm/nwfpe/single_cpdo.c | 1 +
linux-user/elfload.c | 10 +---------
linux-user/flatload.c | 5 +----
linux-user/linuxload.c | 8 +-------
linux-user/m68k-sim.c | 9 +--------
linux-user/main.c | 7 +------
linux-user/mmap.c | 9 +--------
linux-user/signal.c | 7 +------
linux-user/strace.c | 4 +---
linux-user/syscall.c | 14 +-------------
linux-user/uaccess.c | 3 +--
linux-user/uname.c | 2 +-
linux-user/vm86.c | 7 +------
20 files changed, 20 insertions(+), 74 deletions(-)
diff --git a/linux-user/arm/nwfpe/double_cpdo.c
b/linux-user/arm/nwfpe/double_cpdo.c
index 41c28f3..1cef380 100644
--- a/linux-user/arm/nwfpe/double_cpdo.c
+++ b/linux-user/arm/nwfpe/double_cpdo.c
@@ -18,6 +18,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "fpa11.h"
#include "fpu/softfloat.h"
#include "fpopcode.h"
diff --git a/linux-user/arm/nwfpe/extended_cpdo.c
b/linux-user/arm/nwfpe/extended_cpdo.c
index 48eca3b..1c8a412 100644
--- a/linux-user/arm/nwfpe/extended_cpdo.c
+++ b/linux-user/arm/nwfpe/extended_cpdo.c
@@ -18,6 +18,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "fpa11.h"
#include "fpu/softfloat.h"
#include "fpopcode.h"
diff --git a/linux-user/arm/nwfpe/fpa11.c b/linux-user/arm/nwfpe/fpa11.c
index eebd93f..441e3b1 100644
--- a/linux-user/arm/nwfpe/fpa11.c
+++ b/linux-user/arm/nwfpe/fpa11.c
@@ -18,6 +18,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "fpa11.h"
#include "fpopcode.h"
@@ -27,7 +28,6 @@
//#include <asm/system.h>
-#include <stdio.h>
FPA11* qemufpa = NULL;
CPUARMState* user_registers;
diff --git a/linux-user/arm/nwfpe/fpa11_cpdo.c
b/linux-user/arm/nwfpe/fpa11_cpdo.c
index 5f4a6a4..94ac98a 100644
--- a/linux-user/arm/nwfpe/fpa11_cpdo.c
+++ b/linux-user/arm/nwfpe/fpa11_cpdo.c
@@ -18,6 +18,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "fpa11.h"
#include "fpopcode.h"
diff --git a/linux-user/arm/nwfpe/fpa11_cpdt.c
b/linux-user/arm/nwfpe/fpa11_cpdt.c
index 007a3d6..c32b0c2 100644
--- a/linux-user/arm/nwfpe/fpa11_cpdt.c
+++ b/linux-user/arm/nwfpe/fpa11_cpdt.c
@@ -19,6 +19,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "fpa11.h"
#include "fpu/softfloat.h"
#include "fpopcode.h"
diff --git a/linux-user/arm/nwfpe/fpa11_cprt.c
b/linux-user/arm/nwfpe/fpa11_cprt.c
index 7be93fa..04dc2eb 100644
--- a/linux-user/arm/nwfpe/fpa11_cprt.c
+++ b/linux-user/arm/nwfpe/fpa11_cprt.c
@@ -19,6 +19,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "fpa11.h"
#include "fpu/softfloat.h"
#include "fpopcode.h"
diff --git a/linux-user/arm/nwfpe/fpopcode.c b/linux-user/arm/nwfpe/fpopcode.c
index 0ada30c..6784256 100644
--- a/linux-user/arm/nwfpe/fpopcode.c
+++ b/linux-user/arm/nwfpe/fpopcode.c
@@ -18,6 +18,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "fpa11.h"
#include "fpu/softfloat.h"
#include "fpopcode.h"
diff --git a/linux-user/arm/nwfpe/single_cpdo.c
b/linux-user/arm/nwfpe/single_cpdo.c
index 2bfb359..21e177b 100644
--- a/linux-user/arm/nwfpe/single_cpdo.c
+++ b/linux-user/arm/nwfpe/single_cpdo.c
@@ -18,6 +18,7 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "fpa11.h"
#include "fpu/softfloat.h"
#include "fpopcode.h"
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index b90be12..19dc7f5 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -1,17 +1,9 @@
/* This is the Linux kernel elf-loading code, ported into user space */
-#include <sys/time.h>
+#include "qemu/osdep.h"
#include <sys/param.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <unistd.h>
#include <sys/mman.h>
#include <sys/resource.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
#include "qemu.h"
#include "disas/disas.h"
diff --git a/linux-user/flatload.c b/linux-user/flatload.c
index ceacb98..a25c797 100644
--- a/linux-user/flatload.c
+++ b/linux-user/flatload.c
@@ -33,11 +33,8 @@
/****************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
+#include "qemu/osdep.h"
#include <sys/mman.h>
-#include <unistd.h>
#include "qemu.h"
#include "flat.h"
diff --git a/linux-user/linuxload.c b/linux-user/linuxload.c
index dbaf0ec..6f0d605 100644
--- a/linux-user/linuxload.c
+++ b/linux-user/linuxload.c
@@ -1,12 +1,6 @@
/* Code for loading Linux executables. Mostly linux kernel code. */
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include "qemu/osdep.h"
#include "qemu.h"
diff --git a/linux-user/m68k-sim.c b/linux-user/m68k-sim.c
index 1994e40..34d332d 100644
--- a/linux-user/m68k-sim.c
+++ b/linux-user/m68k-sim.c
@@ -17,14 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <time.h>
+#include "qemu/osdep.h"
#include "qemu.h"
diff --git a/linux-user/main.c b/linux-user/main.c
index ee12035..f8d4577 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -16,12 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
+#include "qemu/osdep.h"
#include <sys/mman.h>
#include <sys/syscall.h>
#include <sys/resource.h>
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index 445e8c6..3519147 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -16,14 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+#include "qemu/osdep.h"
#include <sys/mman.h>
#include <linux/mman.h>
#include <linux/unistd.h>
diff --git a/linux-user/signal.c b/linux-user/signal.c
index d4d83f2..327c032 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -16,12 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <errno.h>
+#include "qemu/osdep.h"
#include <sys/ucontext.h>
#include <sys/resource.h>
diff --git a/linux-user/strace.c b/linux-user/strace.c
index ea6c1d2..0810c85 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -1,13 +1,11 @@
-#include <stdio.h>
+#include "qemu/osdep.h"
#include <sys/ipc.h>
#include <sys/msg.h>
#include <sys/sem.h>
#include <sys/shm.h>
#include <sys/select.h>
-#include <sys/types.h>
#include <sys/mount.h>
#include <sys/mman.h>
-#include <unistd.h>
#include <sched.h>
#include "qemu.h"
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 0cbace4..54ce14a 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -17,24 +17,13 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#define _ATFILE_SOURCE
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
+#include "qemu/osdep.h"
#include <elf.h>
#include <endian.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <time.h>
-#include <limits.h>
#include <grp.h>
-#include <sys/types.h>
#include <sys/ipc.h>
#include <sys/msg.h>
#include <sys/wait.h>
-#include <sys/time.h>
-#include <sys/stat.h>
#include <sys/mount.h>
#include <sys/file.h>
#include <sys/fsuid.h>
@@ -44,7 +33,6 @@
#include <sys/mman.h>
#include <sys/swap.h>
#include <linux/capability.h>
-#include <signal.h>
#include <sched.h>
#ifdef __ia64__
int __clone2(int (*fn)(void *), void *child_stack_base,
diff --git a/linux-user/uaccess.c b/linux-user/uaccess.c
index a4d108c..75d890d 100644
--- a/linux-user/uaccess.c
+++ b/linux-user/uaccess.c
@@ -1,6 +1,5 @@
/* User memory access */
-#include <stdio.h>
-#include <string.h>
+#include "qemu/osdep.h"
#include "qemu.h"
diff --git a/linux-user/uname.c b/linux-user/uname.c
index 1e6560d..313b79d 100644
--- a/linux-user/uname.c
+++ b/linux-user/uname.c
@@ -17,7 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdio.h>
+#include "qemu/osdep.h"
#include "qemu.h"
//#include "qemu-common.h"
diff --git a/linux-user/vm86.c b/linux-user/vm86.c
index 22a4eb9..3829b9a 100644
--- a/linux-user/vm86.c
+++ b/linux-user/vm86.c
@@ -16,12 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
+#include "qemu/osdep.h"
#include "qemu.h"
--
1.9.1
- [Qemu-devel] [PATCH 06/37] sparc: Clean up includes, (continued)
- [Qemu-devel] [PATCH 06/37] sparc: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 12/37] arm: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 07/37] s390: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 05/37] ppc: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 15/37] tcg: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 19/37] usb: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 02/37] crypto: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 29/37] openrisc: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 10/37] x86: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 09/37] linux-user: Clean up includes,
Peter Maydell <=
- [Qemu-devel] [PATCH 04/37] lm32: Clean up includes, Peter Maydell, 2016/01/26
- [Qemu-devel] [PATCH 25/37] hw/timer: Clean up includes, Peter Maydell, 2016/01/26
- Re: [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h, Paolo Bonzini, 2016/01/27