Re: [PATCH 3/5] bsd-user: Conditionally use old system calls

["Daniel P. Berrangé" <berrange@redhat.com>]

On Mon, Apr 13, 2026 at 09:31:45AM -0600, Warner Losh wrote:
> sbrk and sstk have been deprecated in FreeBSD for a while now, only
> support them if the version of FreeBSD we're compiling on does. They've
> returned not supported for a while anyway, so no net change.

What versions of FreeBSD still have these syscalls ?

Per out policy we only aim to support the 2 most recent major
versions of distros:

  https://www.qemu.org/docs/master/about/build-platforms.html

So for FreeBSD that means 14.x and 15.x series are all that you
need to retain code support for. Any code for older versions
can be entirely dropped at any convenient time.

> 
> Signed-off-by: Warner Losh <imp@bsdimp.com>
> ---
>  bsd-user/bsd-mem.h            | 2 ++
>  bsd-user/freebsd/os-syscall.c | 4 ++++
>  bsd-user/freebsd/strace.list  | 4 ++++
>  3 files changed, 10 insertions(+)
> 
> diff --git a/bsd-user/bsd-mem.h b/bsd-user/bsd-mem.h
> index a118e57260..a20b703053 100644
> --- a/bsd-user/bsd-mem.h
> +++ b/bsd-user/bsd-mem.h
> @@ -440,6 +440,7 @@ static inline abi_long do_bsd_vadvise(void)
>      return -TARGET_EINVAL;
>  }
>  
> +#ifdef TARGET_FREEBSD_NR_sbrk
>  static inline abi_long do_bsd_sbrk(void)
>  {
>      /* see sys_sbrk() in vm_mmap.c */
> @@ -451,5 +452,6 @@ static inline abi_long do_bsd_sstk(void)
>      /* see sys_sstk() in vm_mmap.c */
>      return -TARGET_EOPNOTSUPP;
>  }
> +#endif
>  
>  #endif /* BSD_USER_BSD_MEM_H */
> diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
> index 85e5db19a3..ff6cbfc481 100644
> --- a/bsd-user/freebsd/os-syscall.c
> +++ b/bsd-user/freebsd/os-syscall.c
> @@ -918,13 +918,17 @@ static abi_long freebsd_syscall(void *cpu_env, int num, abi_long arg1,
>          ret = do_bsd_vadvise();
>          break;
>  
> +#ifdef TARGET_FREEBSD_NR_sbrk
>      case TARGET_FREEBSD_NR_sbrk:
>          ret = do_bsd_sbrk();
>          break;
> +#endif
>  
> +#ifdef TARGET_FREEBSD_NR_sstk
>      case TARGET_FREEBSD_NR_sstk:
>          ret = do_bsd_sstk();
>          break;
> +#endif
>  
>          /*
>           * Misc
> diff --git a/bsd-user/freebsd/strace.list b/bsd-user/freebsd/strace.list
> index 275d2dbe27..d7f61f480e 100644
> --- a/bsd-user/freebsd/strace.list
> +++ b/bsd-user/freebsd/strace.list
> @@ -194,7 +194,9 @@
>  { TARGET_FREEBSD_NR_rfork, "rfork", NULL, NULL, NULL },
>  { TARGET_FREEBSD_NR_rmdir, "rmdir", NULL, NULL, NULL },
>  { TARGET_FREEBSD_NR_rtprio_thread, "rtprio_thread", "%s(%d, %d, %p)", NULL, NULL },
> +#ifdef TARGET_FREEBSD_NR_sbrk
>  { TARGET_FREEBSD_NR_sbrk, "sbrk", NULL, NULL, NULL },
> +#endif
>  { TARGET_FREEBSD_NR_sched_get_priority_max, "sched_get_priority_max", NULL, NULL, NULL },
>  { TARGET_FREEBSD_NR_sched_get_priority_min, "sched_get_priority_min", NULL, NULL, NULL },
>  { TARGET_FREEBSD_NR_sched_yield, "sched_yield", NULL, NULL, NULL },
> @@ -234,7 +236,9 @@
>  { TARGET_FREEBSD_NR_sigsuspend, "sigsuspend", NULL, NULL, NULL },
>  { TARGET_FREEBSD_NR_socket, "socket", "%s(%d,%d,%d)", NULL, NULL },
>  { TARGET_FREEBSD_NR_socketpair, "socketpair", NULL, NULL, NULL },
> +#ifdef TARGET_FREEBSD_NR_sstk
>  { TARGET_FREEBSD_NR_sstk, "sstk", NULL, NULL, NULL },
> +#endif
>  { TARGET_FREEBSD_NR_freebsd11_stat, "freebsd11_stat", "%s(\"%s\",%p)", NULL, NULL },
>  { TARGET_FREEBSD_NR_freebsd11_statfs, "freebsd11_statfs", "%s(\"%s\",%p)", NULL, NULL },
>  { TARGET_FREEBSD_NR_symlink, "symlink", "%s(\"%s\",\"%s\")", NULL, NULL },
> 
> -- 
> 2.52.0
> 

With regards,
Daniel
-- 
|: https://berrange.com       ~~        https://hachyderm.io/@berrange :|
|: https://libvirt.org          ~~          https://entangle-photo.org :|
|: https://pixelfed.art/berrange   ~~    https://fstop138.berrange.com :|