Skip to content

Commit 48e438a

Browse files
author
Markus Armbruster
committed
bsd-user: Clean up includes
This commit was created with scripts/clean-includes. All .c should include qemu/osdep.h first. The script performs three related cleanups: * Ensure .c files include qemu/osdep.h first. * Including it in a .h is redundant, since the .c already includes it. Drop such inclusions. * Likewise, including headers qemu/osdep.h includes is redundant. Drop these, too. Signed-off-by: Markus Armbruster <[email protected]> Reviewed-by: Warner Losh <[email protected]> Reviewed-by: Michael S. Tsirkin <[email protected]> Message-Id: <[email protected]>
1 parent d598d97 commit 48e438a

11 files changed

+9
-13
lines changed

bsd-user/arm/signal.c

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
* along with this program; if not, see <http://www.gnu.org/licenses/>.
1818
*/
1919

20+
#include "qemu/osdep.h"
2021
#include "qemu.h"
2122

2223
/*

bsd-user/arm/target_arch_cpu.c

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
* You should have received a copy of the GNU General Public License
1717
* along with this program; if not, see <http://www.gnu.org/licenses/>.
1818
*/
19+
20+
#include "qemu/osdep.h"
1921
#include "target_arch.h"
2022

2123
void target_cpu_set_tls(CPUARMState *env, target_ulong newtls)

bsd-user/bsd-proc.h

-4
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@
2020
#ifndef BSD_PROC_H_
2121
#define BSD_PROC_H_
2222

23-
#include <sys/types.h>
24-
#include <sys/stat.h>
25-
#include <sys/time.h>
2623
#include <sys/resource.h>
27-
#include <unistd.h>
2824

2925
/* exit(2) */
3026
static inline abi_long do_bsd_exit(void *cpu_env, abi_long arg1)

bsd-user/freebsd/os-sys.c

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
* along with this program; if not, see <http://www.gnu.org/licenses/>.
1818
*/
1919

20+
#include "qemu/osdep.h"
2021
#include "qemu.h"
2122
#include "target_arch_sysarch.h"
2223

bsd-user/i386/signal.c

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
* along with this program; if not, see <http://www.gnu.org/licenses/>.
1818
*/
1919

20+
#include "qemu/osdep.h"
2021
#include "qemu.h"
2122

2223
/*

bsd-user/i386/target_arch_cpu.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717
* along with this program; if not, see <http://www.gnu.org/licenses/>.
1818
*/
1919

20-
#include <sys/types.h>
21-
2220
#include "qemu/osdep.h"
21+
2322
#include "cpu.h"
2423
#include "qemu.h"
2524
#include "qemu/timer.h"

bsd-user/main.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@
1818
* along with this program; if not, see <http://www.gnu.org/licenses/>.
1919
*/
2020

21-
#include <sys/types.h>
22-
#include <sys/time.h>
21+
#include "qemu/osdep.h"
2322
#include <sys/resource.h>
2423
#include <sys/sysctl.h>
2524

26-
#include "qemu/osdep.h"
2725
#include "qemu/help-texts.h"
2826
#include "qemu/units.h"
2927
#include "qemu/accel.h"

bsd-user/qemu.h

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#ifndef QEMU_H
1818
#define QEMU_H
1919

20-
#include "qemu/osdep.h"
2120
#include "cpu.h"
2221
#include "qemu/units.h"
2322
#include "exec/cpu_ldst.h"

bsd-user/strace.c

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <sys/select.h>
2121
#include <sys/syscall.h>
2222
#include <sys/ioccom.h>
23-
#include <ctype.h>
2423

2524
#include "qemu.h"
2625

bsd-user/x86_64/signal.c

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* along with this program; if not, see <http://www.gnu.org/licenses/>.
1717
*/
1818

19+
#include "qemu/osdep.h"
1920
#include "qemu.h"
2021

2122
/*

bsd-user/x86_64/target_arch_cpu.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717
* along with this program; if not, see <http://www.gnu.org/licenses/>.
1818
*/
1919

20-
#include <sys/types.h>
21-
2220
#include "qemu/osdep.h"
21+
2322
#include "cpu.h"
2423
#include "qemu.h"
2524
#include "qemu/timer.h"

0 commit comments

Comments
 (0)