From 05a248715cef192336a594afed812871a52efc1f Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 21 Dec 2021 16:20:32 +0100 Subject: user: move common-user includes to a subdirectory of {bsd,linux}-user/ Avoid polluting the compilation of common-user/ with local include files; making an include file available to common-user/ should be a deliberate decision in order to keep a clear interface that can be used by both bsd-user/ and linux-user/. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- bsd-user/include/special-errno.h | 24 ++++++++++++++++++++++++ bsd-user/meson.build | 2 +- bsd-user/special-errno.h | 24 ------------------------ 3 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 bsd-user/include/special-errno.h delete mode 100644 bsd-user/special-errno.h (limited to 'bsd-user') diff --git a/bsd-user/include/special-errno.h b/bsd-user/include/special-errno.h new file mode 100644 index 0000000000..03599d9b5a --- /dev/null +++ b/bsd-user/include/special-errno.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ +/* + * QEMU internal errno values for implementing user-only POSIX. + * + * Copyright (c) 2021 Linaro, Ltd. + */ + +#ifndef SPECIAL_ERRNO_H +#define SPECIAL_ERRNO_H + +/* + * All of these are QEMU internal, not visible to the guest. + * They should be chosen so as to not overlap with any host + * or guest errno. + */ + +/* + * This is returned when a system call should be restarted, to tell the + * main loop that it should wind the guest PC backwards so it will + * re-execute the syscall after handling any pending signals. + */ +#define QEMU_ERESTARTSYS 255 + +#endif /* SPECIAL_ERRNO_H */ diff --git a/bsd-user/meson.build b/bsd-user/meson.build index 9fcb80c3fa..8380fa44c2 100644 --- a/bsd-user/meson.build +++ b/bsd-user/meson.build @@ -4,7 +4,7 @@ endif bsd_user_ss = ss.source_set() -common_user_inc += include_directories('.') +common_user_inc += include_directories('include') bsd_user_ss.add(files( 'bsdload.c', diff --git a/bsd-user/special-errno.h b/bsd-user/special-errno.h deleted file mode 100644 index 03599d9b5a..0000000000 --- a/bsd-user/special-errno.h +++ /dev/null @@ -1,24 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause */ -/* - * QEMU internal errno values for implementing user-only POSIX. - * - * Copyright (c) 2021 Linaro, Ltd. - */ - -#ifndef SPECIAL_ERRNO_H -#define SPECIAL_ERRNO_H - -/* - * All of these are QEMU internal, not visible to the guest. - * They should be chosen so as to not overlap with any host - * or guest errno. - */ - -/* - * This is returned when a system call should be restarted, to tell the - * main loop that it should wind the guest PC backwards so it will - * re-execute the syscall after handling any pending signals. - */ -#define QEMU_ERESTARTSYS 255 - -#endif /* SPECIAL_ERRNO_H */ -- cgit v1.2.3