From: Karim Taha <kariem.taha2.7@gmail.com>
To: qemu-devel@nongnu.org
Cc: imp@bsdimp.com, Karim Taha <kariem.taha2.7@gmail.com>,
Richard Henderson <richard.henderson@linaro.org>
Subject: [PATCH v3 01/32] Move _WANT_FREEBSD macros to include/qemu/osdep.h
Date: Sun, 13 Aug 2023 10:41:22 +0200 [thread overview]
Message-ID: <20230813084153.6510-2-kariem.taha2.7@gmail.com> (raw)
In-Reply-To: <20230813084153.6510-1-kariem.taha2.7@gmail.com>
From: Warner Losh <imp@bsdimp.com>
move _WANT_FREEBSD macros from bsd-user/freebsd/os-syscall.c to
include/qemu/osdep.h in order to pull some struct defintions needed
later in the build.
Signed-off-by: Warner Losh <imp@bsdimp.com>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
---
bsd-user/freebsd/os-syscall.c | 11 -----------
include/qemu/osdep.h | 13 +++++++++++++
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
index de36c4b71c..2224a280ea 100644
--- a/bsd-user/freebsd/os-syscall.c
+++ b/bsd-user/freebsd/os-syscall.c
@@ -17,17 +17,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-
-/*
- * We need the FreeBSD "legacy" definitions. Rust needs the FreeBSD 11 system
- * calls since it doesn't use libc at all, so we have to emulate that despite
- * FreeBSD 11 being EOL'd.
- */
-#define _WANT_FREEBSD11_STAT
-#define _WANT_FREEBSD11_STATFS
-#define _WANT_FREEBSD11_DIRENT
-#define _WANT_KERNEL_ERRNO
-#define _WANT_SEMUN
#include "qemu/osdep.h"
#include "qemu/cutils.h"
#include "qemu/path.h"
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index cc61b00ba9..1ca94ad3de 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -88,6 +88,19 @@ QEMU_EXTERN_C int daemon(int, int);
#define __USE_MINGW_ANSI_STDIO 1
#endif
+/*
+ * We need the FreeBSD "legacy" definitions. Rust needs the FreeBSD 11 system
+ * calls since it doesn't use libc at all, so we have to emulate that despite
+ * FreeBSD 11 being EOL'd.
+ */
+#ifdef __FreeBSD__
+#define _WANT_FREEBSD11_STAT
+#define _WANT_FREEBSD11_STATFS
+#define _WANT_FREEBSD11_DIRENT
+#define _WANT_KERNEL_ERRNO
+#define _WANT_SEMUN
+#endif
+
#include <stdarg.h>
#include <stddef.h>
#include <stdbool.h>
--
2.40.0
next prev parent reply other threads:[~2023-08-13 19:44 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-13 8:41 [PATCH v3 00/32] Implement the stat system calls for FreeBSD Karim Taha
2023-08-13 8:41 ` Karim Taha [this message]
2023-08-13 8:41 ` [PATCH v3 02/32] Disable clang warnings Karim Taha
2023-08-13 8:41 ` [PATCH v3 03/32] Update the definitions of __put_user and __get_user macros Karim Taha
2023-08-13 8:41 ` [PATCH v3 04/32] Declarations of h2t and t2h conversion functions Karim Taha
2023-08-13 8:41 ` [PATCH v3 05/32] Add struct target_freebsd11_stat to bsd-user/syscall_defs Karim Taha
2023-08-13 8:41 ` [PATCH v3 06/32] Add struct target_stat to bsd-user/syscall_defs.h Karim Taha
2023-08-13 8:41 ` [PATCH v3 07/32] Add structs target_freebsd11_nstat and target_freebsd11_statfs " Karim Taha
2023-08-13 8:41 ` [PATCH v3 08/32] Add struct target_statfs " Karim Taha
2023-08-13 8:41 ` [PATCH v3 09/32] Add struct target_freebsd_fhandle and fcntl flags " Karim Taha
2023-08-13 8:41 ` [PATCH v3 10/32] Define safe_fcntl macro in bsd-user/syscall_defs.h Karim Taha
2023-08-13 8:41 ` [PATCH v3 11/32] Rename target_freebsd_time_t to target_time_t Karim Taha
2023-08-13 8:41 ` [PATCH v3 12/32] Implement h2t_freebsd11_stat h2t_freebsd_nstat Karim Taha
2023-08-13 8:41 ` [PATCH v3 13/32] Implement h2t_freebsd_fhandle t2h_freebsd_fhandle functions Karim Taha
2023-08-13 8:41 ` [PATCH v3 14/32] Implement h2t_freebds11_statfs Karim Taha
2023-08-13 8:41 ` [PATCH v3 15/32] Implement target_to_host_fcntl_cmd Karim Taha
2023-08-13 8:41 ` [PATCH v3 16/32] Implement h2t_freebsd_stat and h2t_freebsd_statfs functions Karim Taha
2023-08-13 8:41 ` [PATCH v3 17/32] Implement stat related syscalls Karim Taha
2023-08-13 8:41 ` [PATCH v3 18/32] " Karim Taha
2023-08-13 8:41 ` [PATCH v3 19/32] " Karim Taha
2023-08-13 8:41 ` [PATCH v3 20/32] " Karim Taha
2023-08-13 8:41 ` [PATCH v3 21/32] " Karim Taha
2023-08-13 8:41 ` [PATCH v3 22/32] Implement freebsd11 " Karim Taha
2023-08-13 8:41 ` [PATCH v3 23/32] " Karim Taha
2023-08-13 8:41 ` [PATCH v3 24/32] " Karim Taha
2023-08-13 8:41 ` [PATCH v3 25/32] " Karim Taha
2023-08-13 8:41 ` [PATCH v3 26/32] " Karim Taha
2023-08-13 8:41 ` [PATCH v3 27/32] Implement do_freebsd_realpathat syscall Karim Taha
2023-08-13 8:41 ` [PATCH v3 28/32] Add os-stat.c to the build Karim Taha
2023-08-13 8:41 ` [PATCH v3 29/32] Add glue to call the following syscalls to the freebsd_syscall function: Karim Taha
2023-08-13 8:41 ` [PATCH v3 30/32] " Karim Taha
2023-08-13 8:41 ` [PATCH v3 31/32] " Karim Taha
2023-08-13 8:41 ` [PATCH v3 32/32] " Karim Taha
2023-08-20 4:03 ` [PATCH v3 00/32] Implement the stat system calls for FreeBSD Warner Losh
2023-08-21 11:59 ` Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230813084153.6510-2-kariem.taha2.7@gmail.com \
--to=kariem.taha2.7@gmail.com \
--cc=imp@bsdimp.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).