1. Patchew
  2. QEMU
  3. View series

[PATCH] bsd-user: Switch to SPDX-License-Expression

Warner Losh posted 1 patch 1 month, 1 week ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20260302-bsd-user-copyright-v1-1-f05587d18d4e@bsdimp.com
Maintainers: Warner Losh <imp@bsdimp.com>, Kyle Evans <kevans@freebsd.org>
There is a newer version of this series
bsd-user/aarch64/signal.c               | 15 ++-------------
bsd-user/aarch64/target_arch.h          | 16 ++--------------
bsd-user/aarch64/target_arch_cpu.c      | 15 ++-------------
bsd-user/aarch64/target_arch_cpu.h      | 18 +++---------------
bsd-user/aarch64/target_arch_elf.h      | 14 +-------------
bsd-user/aarch64/target_arch_reg.h      | 19 +++----------------
bsd-user/aarch64/target_arch_signal.h   | 16 ++--------------
bsd-user/aarch64/target_arch_sigtramp.h | 16 ++--------------
bsd-user/aarch64/target_arch_sysarch.h  | 16 ++--------------
bsd-user/aarch64/target_arch_thread.h   | 16 ++--------------
bsd-user/aarch64/target_arch_vmparam.h  | 16 ++--------------
bsd-user/aarch64/target_syscall.h       | 16 ++--------------
bsd-user/arm/signal.c                   | 18 +++---------------
bsd-user/arm/target_arch.h              | 16 ++--------------
bsd-user/arm/target_arch_cpu.c          | 18 +++---------------
bsd-user/arm/target_arch_cpu.h          | 18 +++---------------
bsd-user/arm/target_arch_elf.h          | 18 +++---------------
bsd-user/arm/target_arch_reg.h          | 18 +++---------------
bsd-user/arm/target_arch_signal.h       | 18 +++---------------
bsd-user/arm/target_arch_sigtramp.h     | 18 +++---------------
bsd-user/arm/target_arch_sysarch.h      | 18 +++---------------
bsd-user/arm/target_arch_thread.h       | 18 +++---------------
bsd-user/arm/target_arch_vmparam.h      | 18 +++---------------
bsd-user/arm/target_syscall.h           | 18 +++---------------
bsd-user/bsd-file.h                     | 18 +++---------------
bsd-user/bsd-mem.c                      | 17 +++--------------
bsd-user/bsd-mem.h                      | 17 +++--------------
bsd-user/bsd-proc.c                     | 17 +++--------------
bsd-user/bsd-proc.h                     | 17 +++--------------
bsd-user/bsdload.c                      | 17 +++--------------
bsd-user/elfload.c                      | 17 +++--------------
bsd-user/freebsd/os-misc.h              | 18 +++---------------
bsd-user/freebsd/os-proc.c              | 17 +++--------------
bsd-user/freebsd/os-proc.h              | 18 +++---------------
bsd-user/freebsd/os-stat.c              | 17 +++--------------
bsd-user/freebsd/os-stat.h              | 18 +++---------------
bsd-user/freebsd/os-strace.h            | 19 +++----------------
bsd-user/freebsd/target_os_elf.h        | 18 +++---------------
bsd-user/freebsd/target_os_siginfo.h    | 18 +++---------------
bsd-user/freebsd/target_os_stack.h      | 18 +++---------------
bsd-user/freebsd/target_os_thread.h     | 18 +++---------------
bsd-user/freebsd/target_os_user.h       | 18 +++---------------
bsd-user/freebsd/target_os_vmparam.h    | 18 +++---------------
bsd-user/i386/signal.c                  | 17 +++--------------
bsd-user/i386/target_arch.h             | 16 ++--------------
bsd-user/i386/target_arch_cpu.c         | 17 +++--------------
bsd-user/i386/target_arch_cpu.h         | 17 +++--------------
bsd-user/i386/target_arch_elf.h         | 18 +++---------------
bsd-user/i386/target_arch_reg.h         | 19 +++----------------
bsd-user/i386/target_arch_signal.h      | 16 +++-------------
bsd-user/i386/target_arch_sigtramp.h    | 16 ++--------------
bsd-user/i386/target_arch_sysarch.h     | 18 +++---------------
bsd-user/i386/target_arch_thread.h      | 18 +++---------------
bsd-user/i386/target_arch_vmparam.h     | 18 +++---------------
bsd-user/i386/target_syscall.h          | 16 +++-------------
bsd-user/main.c                         | 20 ++++----------------
bsd-user/mmap.c                         | 17 +++--------------
bsd-user/qemu-bsd.h                     | 18 +++---------------
bsd-user/qemu.h                         | 15 +++------------
bsd-user/signal.c                       | 19 ++++---------------
bsd-user/strace.c                       | 16 +++-------------
bsd-user/syscall_defs.h                 | 18 +++---------------
bsd-user/x86_64/signal.c                | 16 +++-------------
bsd-user/x86_64/target_arch.h           | 16 ++--------------
bsd-user/x86_64/target_arch_cpu.c       | 17 +++--------------
bsd-user/x86_64/target_arch_cpu.h       | 17 +++--------------
bsd-user/x86_64/target_arch_elf.h       | 18 +++---------------
bsd-user/x86_64/target_arch_reg.h       | 19 +++----------------
bsd-user/x86_64/target_arch_signal.h    | 17 +++--------------
bsd-user/x86_64/target_arch_sigtramp.h  | 17 ++---------------
bsd-user/x86_64/target_arch_sysarch.h   | 17 +++--------------
bsd-user/x86_64/target_arch_thread.h    | 18 +++---------------
bsd-user/x86_64/target_arch_vmparam.h   | 18 +++---------------
bsd-user/x86_64/target_syscall.h        | 16 +++-------------
74 files changed, 208 insertions(+), 1069 deletions(-)
Re: [PATCH] bsd-user: Switch to SPDX-License-Expression
Posted by Daniel P. Berrangé 1 month, 1 week ago 
On Mon, Mar 02, 2026 at 09:46:06PM -0700, Warner Losh wrote:
> Switch all the files over to using SPDX. This also corrects various
> small errors in the form of the copyright messages. It adds copyright to
> those files that lack it. There's no functional change.
> 
> Signed-off-by: Stacey Son <sson@FreeBSD.org>
> Signed-off-by: Warner Losh <imp@bsdimp.com>
> ---
> Since I'll be upstreaming more files from bsd-user, and since qemu now
> requires SPDX and prohibits boilerplate, this will make it easier. I've
> converted all the relevant bits in bsd-user upstream.

Note, QEMU / checkpatch.pl only requires SDPX on *newly* authored files.
Existing code files, or new files whose content is copied from an
existing file (either inside or outside QEMU git) are exempt from this
and in fact required to be left without SPDX.

The reasoning is that there is some uncertainty about the legality of
removing license header text from existing files due to the GPL clause
1 which says

  "keep intact all the notices that refer to this License and
   to the absence of any warranty;"

I interpret that to mean we can not remove license header text from
files unless the person doing the removal is the exclusive copyright
holder, or has got recorded permission from all copyright holders
that apply to each file changed.

It is confusing for people because Linux removed all their GPL header
text in favour of SPDX, but never provided any clear explanation of
why they considered that to be acceptable from the GPL compliance POV.

> ---
>  bsd-user/aarch64/signal.c               | 15 ++-------------
>  bsd-user/aarch64/target_arch.h          | 16 ++--------------
>  bsd-user/aarch64/target_arch_cpu.c      | 15 ++-------------
>  bsd-user/aarch64/target_arch_cpu.h      | 18 +++---------------
>  bsd-user/aarch64/target_arch_elf.h      | 14 +-------------
>  bsd-user/aarch64/target_arch_reg.h      | 19 +++----------------
>  bsd-user/aarch64/target_arch_signal.h   | 16 ++--------------
>  bsd-user/aarch64/target_arch_sigtramp.h | 16 ++--------------
>  bsd-user/aarch64/target_arch_sysarch.h  | 16 ++--------------
>  bsd-user/aarch64/target_arch_thread.h   | 16 ++--------------
>  bsd-user/aarch64/target_arch_vmparam.h  | 16 ++--------------
>  bsd-user/aarch64/target_syscall.h       | 16 ++--------------
>  bsd-user/arm/signal.c                   | 18 +++---------------
>  bsd-user/arm/target_arch.h              | 16 ++--------------
>  bsd-user/arm/target_arch_cpu.c          | 18 +++---------------
>  bsd-user/arm/target_arch_cpu.h          | 18 +++---------------
>  bsd-user/arm/target_arch_elf.h          | 18 +++---------------
>  bsd-user/arm/target_arch_reg.h          | 18 +++---------------
>  bsd-user/arm/target_arch_signal.h       | 18 +++---------------
>  bsd-user/arm/target_arch_sigtramp.h     | 18 +++---------------
>  bsd-user/arm/target_arch_sysarch.h      | 18 +++---------------
>  bsd-user/arm/target_arch_thread.h       | 18 +++---------------
>  bsd-user/arm/target_arch_vmparam.h      | 18 +++---------------
>  bsd-user/arm/target_syscall.h           | 18 +++---------------
>  bsd-user/bsd-file.h                     | 18 +++---------------
>  bsd-user/bsd-mem.c                      | 17 +++--------------
>  bsd-user/bsd-mem.h                      | 17 +++--------------
>  bsd-user/bsd-proc.c                     | 17 +++--------------
>  bsd-user/bsd-proc.h                     | 17 +++--------------
>  bsd-user/bsdload.c                      | 17 +++--------------
>  bsd-user/elfload.c                      | 17 +++--------------
>  bsd-user/freebsd/os-misc.h              | 18 +++---------------
>  bsd-user/freebsd/os-proc.c              | 17 +++--------------
>  bsd-user/freebsd/os-proc.h              | 18 +++---------------
>  bsd-user/freebsd/os-stat.c              | 17 +++--------------
>  bsd-user/freebsd/os-stat.h              | 18 +++---------------
>  bsd-user/freebsd/os-strace.h            | 19 +++----------------
>  bsd-user/freebsd/target_os_elf.h        | 18 +++---------------
>  bsd-user/freebsd/target_os_siginfo.h    | 18 +++---------------
>  bsd-user/freebsd/target_os_stack.h      | 18 +++---------------
>  bsd-user/freebsd/target_os_thread.h     | 18 +++---------------
>  bsd-user/freebsd/target_os_user.h       | 18 +++---------------
>  bsd-user/freebsd/target_os_vmparam.h    | 18 +++---------------
>  bsd-user/i386/signal.c                  | 17 +++--------------
>  bsd-user/i386/target_arch.h             | 16 ++--------------
>  bsd-user/i386/target_arch_cpu.c         | 17 +++--------------
>  bsd-user/i386/target_arch_cpu.h         | 17 +++--------------
>  bsd-user/i386/target_arch_elf.h         | 18 +++---------------
>  bsd-user/i386/target_arch_reg.h         | 19 +++----------------
>  bsd-user/i386/target_arch_signal.h      | 16 +++-------------
>  bsd-user/i386/target_arch_sigtramp.h    | 16 ++--------------
>  bsd-user/i386/target_arch_sysarch.h     | 18 +++---------------
>  bsd-user/i386/target_arch_thread.h      | 18 +++---------------
>  bsd-user/i386/target_arch_vmparam.h     | 18 +++---------------
>  bsd-user/i386/target_syscall.h          | 16 +++-------------
>  bsd-user/main.c                         | 20 ++++----------------
>  bsd-user/mmap.c                         | 17 +++--------------
>  bsd-user/qemu-bsd.h                     | 18 +++---------------
>  bsd-user/qemu.h                         | 15 +++------------
>  bsd-user/signal.c                       | 19 ++++---------------
>  bsd-user/strace.c                       | 16 +++-------------
>  bsd-user/syscall_defs.h                 | 18 +++---------------
>  bsd-user/x86_64/signal.c                | 16 +++-------------
>  bsd-user/x86_64/target_arch.h           | 16 ++--------------
>  bsd-user/x86_64/target_arch_cpu.c       | 17 +++--------------
>  bsd-user/x86_64/target_arch_cpu.h       | 17 +++--------------
>  bsd-user/x86_64/target_arch_elf.h       | 18 +++---------------
>  bsd-user/x86_64/target_arch_reg.h       | 19 +++----------------
>  bsd-user/x86_64/target_arch_signal.h    | 17 +++--------------
>  bsd-user/x86_64/target_arch_sigtramp.h  | 17 ++---------------
>  bsd-user/x86_64/target_arch_sysarch.h   | 17 +++--------------
>  bsd-user/x86_64/target_arch_thread.h    | 18 +++---------------
>  bsd-user/x86_64/target_arch_vmparam.h   | 18 +++---------------
>  bsd-user/x86_64/target_syscall.h        | 16 +++-------------
>  74 files changed, 208 insertions(+), 1069 deletions(-)
> 
> diff --git a/bsd-user/aarch64/signal.c b/bsd-user/aarch64/signal.c
> index 6bc73a798f..ad19e5144e 100644
> --- a/bsd-user/aarch64/signal.c
> +++ b/bsd-user/aarch64/signal.c
> @@ -1,20 +1,9 @@
>  /*
>   * ARM AArch64 specific signal definitions for bsd-user
>   *
> - * Copyright (c) 2015 Stacey D. Son <sson at FreeBSD>
> + * Copyright (c) 2015 Stacey D. Son
>   *
> - * This library is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU Lesser General Public
> - * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> - *
> - * This library is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> - * Lesser General Public License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public
> - * License along with this library; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
>  #include "qemu/osdep.h"
>  
> diff --git a/bsd-user/aarch64/target_arch.h b/bsd-user/aarch64/target_arch.h
> index 4815a56ae3..7861233889 100644
> --- a/bsd-user/aarch64/target_arch.h
> +++ b/bsd-user/aarch64/target_arch.h
> @@ -1,22 +1,10 @@
>  /*
>   * ARM AArch64 specific prototypes for bsd-user
>   *
> - * Copyright (c) 2015 Stacey D. Son <sson at FreeBSD>
> + * Copyright (c) 2015 Stacey D. Son
>   *
> - * This library is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU Lesser General Public
> - * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> - *
> - * This library is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> - * Lesser General Public License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public
> - * License along with this library; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_H
>  #define TARGET_ARCH_H
>  
> diff --git a/bsd-user/aarch64/target_arch_cpu.c b/bsd-user/aarch64/target_arch_cpu.c
> index b2fa59efaf..6e9519e1b0 100644
> --- a/bsd-user/aarch64/target_arch_cpu.c
> +++ b/bsd-user/aarch64/target_arch_cpu.c
> @@ -1,20 +1,9 @@
>  /*
>   * ARM AArch64 specific CPU for bsd-user
>   *
> - * Copyright (c) 2015 Stacey Son
> + * Copyright (c) 2015 Stacey D. Son
>   *
> - * This library is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU Lesser General Public
> - * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> - *
> - * This library is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> - * Lesser General Public License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public
> - * License along with this library; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
>  #include "qemu/osdep.h"
>  #include "target_arch.h"
> diff --git a/bsd-user/aarch64/target_arch_cpu.h b/bsd-user/aarch64/target_arch_cpu.h
> index 15df84fda2..09d942b040 100644
> --- a/bsd-user/aarch64/target_arch_cpu.h
> +++ b/bsd-user/aarch64/target_arch_cpu.h
> @@ -1,22 +1,10 @@
>  /*
> - *  ARM AArch64 cpu init and loop
> + * ARM AArch64 cpu init and loop
>   *
> - * Copyright (c) 2015 Stacey Son
> + * Copyright (c) 2015 Stacey D. Son
>   *
> - * This library is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU Lesser General Public
> - * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> - *
> - * This library is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> - * Lesser General Public License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public
> - * License along with this library; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_CPU_H
>  #define TARGET_ARCH_CPU_H
>  
> diff --git a/bsd-user/aarch64/target_arch_elf.h b/bsd-user/aarch64/target_arch_elf.h
> index cec254f88b..5ea5232a57 100644
> --- a/bsd-user/aarch64/target_arch_elf.h
> +++ b/bsd-user/aarch64/target_arch_elf.h
> @@ -3,20 +3,8 @@
>   *
>   * Copyright (c) 2015 Stacey D. Son
>   *
> - * This library is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU Lesser General Public
> - * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> - *
> - * This library is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> - * Lesser General Public License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public
> - * License along with this library; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_ELF_H
>  #define TARGET_ARCH_ELF_H
>  
> diff --git a/bsd-user/aarch64/target_arch_reg.h b/bsd-user/aarch64/target_arch_reg.h
> index b53302e7f7..9cca3c0ea0 100644
> --- a/bsd-user/aarch64/target_arch_reg.h
> +++ b/bsd-user/aarch64/target_arch_reg.h
> @@ -1,23 +1,10 @@
>  /*
> - *  FreeBSD arm64 register structures
> + * FreeBSD arm64 register structures
>   *
> - *  Copyright (c) 2015 Stacey Son
> - *  All rights reserved.
> + * Copyright (c) 2015 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_REG_H
>  #define TARGET_ARCH_REG_H
>  
> diff --git a/bsd-user/aarch64/target_arch_signal.h b/bsd-user/aarch64/target_arch_signal.h
> index b72ba7aa50..6085217546 100644
> --- a/bsd-user/aarch64/target_arch_signal.h
> +++ b/bsd-user/aarch64/target_arch_signal.h
> @@ -1,22 +1,10 @@
>  /*
>   * ARM AArch64 specific signal definitions for bsd-user
>   *
> - * Copyright (c) 2015 Stacey D. Son <sson at FreeBSD>
> + * Copyright (c) 2015 Stacey D. Son
>   *
> - * This library is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU Lesser General Public
> - * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> - *
> - * This library is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> - * Lesser General Public License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public
> - * License along with this library; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_SIGNAL_H
>  #define TARGET_ARCH_SIGNAL_H
>  
> diff --git a/bsd-user/aarch64/target_arch_sigtramp.h b/bsd-user/aarch64/target_arch_sigtramp.h
> index 8cdd33b621..38a447fc25 100644
> --- a/bsd-user/aarch64/target_arch_sigtramp.h
> +++ b/bsd-user/aarch64/target_arch_sigtramp.h
> @@ -1,22 +1,10 @@
>  /*
>   * ARM AArch64 sigcode for bsd-user
>   *
> - * Copyright (c) 2015 Stacey D. Son <sson at FreeBSD>
> + * Copyright (c) 2015 Stacey D. Son
>   *
> - * This library is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU Lesser General Public
> - * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> - *
> - * This library is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> - * Lesser General Public License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public
> - * License along with this library; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_SIGTRAMP_H
>  #define TARGET_ARCH_SIGTRAMP_H
>  
> diff --git a/bsd-user/aarch64/target_arch_sysarch.h b/bsd-user/aarch64/target_arch_sysarch.h
> index b003015daf..5569c996cb 100644
> --- a/bsd-user/aarch64/target_arch_sysarch.h
> +++ b/bsd-user/aarch64/target_arch_sysarch.h
> @@ -1,22 +1,10 @@
>  /*
>   * ARM AArch64 sysarch() system call emulation for bsd-user.
>   *
> - * Copyright (c) 2015 <sson at FreeBSD>
> + * Copyright (c) 2015 Stacey D. Son
>   *
> - * This library is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU Lesser General Public
> - * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> - *
> - * This library is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> - * Lesser General Public License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public
> - * License along with this library; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_SYSARCH_H
>  #define TARGET_ARCH_SYSARCH_H
>  
> diff --git a/bsd-user/aarch64/target_arch_thread.h b/bsd-user/aarch64/target_arch_thread.h
> index 4c911e605a..06676980c9 100644
> --- a/bsd-user/aarch64/target_arch_thread.h
> +++ b/bsd-user/aarch64/target_arch_thread.h
> @@ -1,22 +1,10 @@
>  /*
>   * ARM AArch64 thread support for bsd-user.
>   *
> - * Copyright (c) 2015 Stacey D. Son <sson at FreeBSD>
> + * Copyright (c) 2015 Stacey D. Son
>   *
> - * This library is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU Lesser General Public
> - * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> - *
> - * This library is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> - * Lesser General Public License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public
> - * License along with this library; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_THREAD_H
>  #define TARGET_ARCH_THREAD_H
>  
> diff --git a/bsd-user/aarch64/target_arch_vmparam.h b/bsd-user/aarch64/target_arch_vmparam.h
> index 0c35491970..ea32f5b56d 100644
> --- a/bsd-user/aarch64/target_arch_vmparam.h
> +++ b/bsd-user/aarch64/target_arch_vmparam.h
> @@ -1,22 +1,10 @@
>  /*
>   * ARM AArch64 VM parameters definitions for bsd-user.
>   *
> - * Copyright (c) 2015 Stacey D. Son <sson at FreeBSD>
> + * Copyright (c) 2015 Stacey D. Son
>   *
> - * This library is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU Lesser General Public
> - * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> - *
> - * This library is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> - * Lesser General Public License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public
> - * License along with this library; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_VMPARAM_H
>  #define TARGET_ARCH_VMPARAM_H
>  
> diff --git a/bsd-user/aarch64/target_syscall.h b/bsd-user/aarch64/target_syscall.h
> index 08ae913c42..a574edc429 100644
> --- a/bsd-user/aarch64/target_syscall.h
> +++ b/bsd-user/aarch64/target_syscall.h
> @@ -1,22 +1,10 @@
>  /*
>   * ARM AArch64 specific CPU for bsd-user
>   *
> - * Copyright (c) 2015 Stacey D. Son <sson at Freebsd>
> + * Copyright (c) 2015 Stacey D. Son
>   *
> - * This library is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU Lesser General Public
> - * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> - *
> - * This library is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> - * Lesser General Public License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public
> - * License along with this library; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef BSD_USER_AARCH64_TARGET_SYSCALL_H
>  #define BSD_USER_AARCH64_TARGET_SYSCALL_H
>  
> diff --git a/bsd-user/arm/signal.c b/bsd-user/arm/signal.c
> index 9734407543..35cedeba06 100644
> --- a/bsd-user/arm/signal.c
> +++ b/bsd-user/arm/signal.c
> @@ -1,22 +1,10 @@
>  /*
> - *  arm signal functions
> + * arm signal functions
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #include "qemu/osdep.h"
>  #include "qemu.h"
>  
> diff --git a/bsd-user/arm/target_arch.h b/bsd-user/arm/target_arch.h
> index d80cb85c64..e0add162e8 100644
> --- a/bsd-user/arm/target_arch.h
> +++ b/bsd-user/arm/target_arch.h
> @@ -1,22 +1,10 @@
>  /*
>   * ARM 32-bit specific prototypes for bsd-user
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_H
>  #define TARGET_ARCH_H
>  
> diff --git a/bsd-user/arm/target_arch_cpu.c b/bsd-user/arm/target_arch_cpu.c
> index fe38ae2210..6a4f5cec0e 100644
> --- a/bsd-user/arm/target_arch_cpu.c
> +++ b/bsd-user/arm/target_arch_cpu.c
> @@ -1,22 +1,10 @@
>  /*
> - *  arm cpu related code
> + * arm cpu related code
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #include "qemu/osdep.h"
>  #include "target_arch.h"
>  
> diff --git a/bsd-user/arm/target_arch_cpu.h b/bsd-user/arm/target_arch_cpu.h
> index 9a952ef0ff..faef3ea17a 100644
> --- a/bsd-user/arm/target_arch_cpu.h
> +++ b/bsd-user/arm/target_arch_cpu.h
> @@ -1,22 +1,10 @@
>  /*
> - *  arm cpu init and loop
> + * arm cpu init and loop
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_CPU_H
>  #define TARGET_ARCH_CPU_H
>  
> diff --git a/bsd-user/arm/target_arch_elf.h b/bsd-user/arm/target_arch_elf.h
> index b54bf5fbc6..fd13bc87f4 100644
> --- a/bsd-user/arm/target_arch_elf.h
> +++ b/bsd-user/arm/target_arch_elf.h
> @@ -1,22 +1,10 @@
>  /*
> - *  arm ELF definitions
> + * arm ELF definitions
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_ELF_H
>  #define TARGET_ARCH_ELF_H
>  
> diff --git a/bsd-user/arm/target_arch_reg.h b/bsd-user/arm/target_arch_reg.h
> index 070fa24da1..9d23dda27d 100644
> --- a/bsd-user/arm/target_arch_reg.h
> +++ b/bsd-user/arm/target_arch_reg.h
> @@ -1,22 +1,10 @@
>  /*
> - *  FreeBSD arm register structures
> + * FreeBSD arm register structures
>   *
> - *  Copyright (c) 2015 Stacey Son
> + * Copyright (c) 2015 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_REG_H
>  #define TARGET_ARCH_REG_H
>  
> diff --git a/bsd-user/arm/target_arch_signal.h b/bsd-user/arm/target_arch_signal.h
> index 10f96b8bfc..dfaefa25d1 100644
> --- a/bsd-user/arm/target_arch_signal.h
> +++ b/bsd-user/arm/target_arch_signal.h
> @@ -1,22 +1,10 @@
>  /*
> - *  arm signal definitions
> + * arm signal definitions
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_SIGNAL_H
>  #define TARGET_ARCH_SIGNAL_H
>  
> diff --git a/bsd-user/arm/target_arch_sigtramp.h b/bsd-user/arm/target_arch_sigtramp.h
> index 06198045ed..8a2d34aafc 100644
> --- a/bsd-user/arm/target_arch_sigtramp.h
> +++ b/bsd-user/arm/target_arch_sigtramp.h
> @@ -1,22 +1,10 @@
>  /*
> - *  arm sysarch() system call emulation
> + * arm sysarch() system call emulation
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_SIGTRAMP_H
>  #define TARGET_ARCH_SIGTRAMP_H
>  
> diff --git a/bsd-user/arm/target_arch_sysarch.h b/bsd-user/arm/target_arch_sysarch.h
> index 5cb7864197..5f7c421e11 100644
> --- a/bsd-user/arm/target_arch_sysarch.h
> +++ b/bsd-user/arm/target_arch_sysarch.h
> @@ -1,22 +1,10 @@
>  /*
> - *  arm sysarch() system call emulation
> + * arm sysarch() system call emulation
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_SYSARCH_H
>  #define TARGET_ARCH_SYSARCH_H
>  
> diff --git a/bsd-user/arm/target_arch_thread.h b/bsd-user/arm/target_arch_thread.h
> index fd257f313d..d22619a845 100644
> --- a/bsd-user/arm/target_arch_thread.h
> +++ b/bsd-user/arm/target_arch_thread.h
> @@ -1,22 +1,10 @@
>  /*
> - *  arm thread support
> + * arm thread support
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_THREAD_H
>  #define TARGET_ARCH_THREAD_H
>  
> diff --git a/bsd-user/arm/target_arch_vmparam.h b/bsd-user/arm/target_arch_vmparam.h
> index 3fb69aff51..c973fcf7d5 100644
> --- a/bsd-user/arm/target_arch_vmparam.h
> +++ b/bsd-user/arm/target_arch_vmparam.h
> @@ -1,22 +1,10 @@
>  /*
> - *  arm VM parameters definitions
> + * arm VM parameters definitions
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_VMPARAM_H
>  #define TARGET_ARCH_VMPARAM_H
>  
> diff --git a/bsd-user/arm/target_syscall.h b/bsd-user/arm/target_syscall.h
> index 5804a53541..deab3baebf 100644
> --- a/bsd-user/arm/target_syscall.h
> +++ b/bsd-user/arm/target_syscall.h
> @@ -1,22 +1,10 @@
>  /*
> - *  arm cpu system call stubs
> + * arm cpu system call stubs
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef ARM_TARGET_SYSCALL_H
>  #define ARM_TARGET_SYSCALL_H
>  
> diff --git a/bsd-user/bsd-file.h b/bsd-user/bsd-file.h
> index 6fa2c30b4d..dca1518cb1 100644
> --- a/bsd-user/bsd-file.h
> +++ b/bsd-user/bsd-file.h
> @@ -1,22 +1,10 @@
>  /*
> - *  file related system call shims and definitions
> + * file related system call shims and definitions
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef BSD_FILE_H
>  #define BSD_FILE_H
>  
> diff --git a/bsd-user/bsd-mem.c b/bsd-user/bsd-mem.c
> index 2ab1334b70..8c6c4081f7 100644
> --- a/bsd-user/bsd-mem.c
> +++ b/bsd-user/bsd-mem.c
> @@ -1,20 +1,9 @@
>  /*
> - *  memory management system conversion routines
> + * memory management system conversion routines
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
>  #include "qemu/osdep.h"
>  #include "qemu.h"
> diff --git a/bsd-user/bsd-mem.h b/bsd-user/bsd-mem.h
> index a118e57260..8c0b0b6919 100644
> --- a/bsd-user/bsd-mem.h
> +++ b/bsd-user/bsd-mem.h
> @@ -1,20 +1,9 @@
>  /*
> - *  memory management system call shims and definitions
> + * memory management system call shims and definitions
>   *
> - *  Copyright (c) 2013-15 Stacey D. Son
> + * Copyright (c) 2013-2015 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
>  
>  /*
> diff --git a/bsd-user/bsd-proc.c b/bsd-user/bsd-proc.c
> index 8dcac9608d..7fb46046c7 100644
> --- a/bsd-user/bsd-proc.c
> +++ b/bsd-user/bsd-proc.c
> @@ -1,20 +1,9 @@
>  /*
> - *  BSD process related system call helpers
> + * BSD process related system call helpers
>   *
> - *  Copyright (c) 2013-14 Stacey D. Son
> + * Copyright (c) 2013-2014 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
>  #include "qemu/osdep.h"
>  
> diff --git a/bsd-user/bsd-proc.h b/bsd-user/bsd-proc.h
> index 8b1c2deea3..b1d4446ff1 100644
> --- a/bsd-user/bsd-proc.h
> +++ b/bsd-user/bsd-proc.h
> @@ -1,20 +1,9 @@
>  /*
> - *  process related system call shims and definitions
> + * process related system call shims and definitions
>   *
> - *  Copyright (c) 2013-2014 Stacey D. Son
> + * Copyright (c) 2013-2014 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
>  
>  #ifndef BSD_PROC_H_
> diff --git a/bsd-user/bsdload.c b/bsd-user/bsdload.c
> index 5b3c061a45..b3c9f0265b 100644
> --- a/bsd-user/bsdload.c
> +++ b/bsd-user/bsdload.c
> @@ -1,22 +1,11 @@
>  /*
> - *  Load BSD executables.
> + * Load BSD executables.
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #include "qemu/osdep.h"
> -
>  #include "qemu.h"
>  
>  /* ??? This should really be somewhere else.  */
> diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c
> index 3bca0cc9ed..ddac272424 100644
> --- a/bsd-user/elfload.c
> +++ b/bsd-user/elfload.c
> @@ -1,20 +1,9 @@
>  /*
> - *  ELF loading code
> + * ELF loading code
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
>  
>  #include "qemu/osdep.h"
> diff --git a/bsd-user/freebsd/os-misc.h b/bsd-user/freebsd/os-misc.h
> index 71145764a4..d9979b2a8b 100644
> --- a/bsd-user/freebsd/os-misc.h
> +++ b/bsd-user/freebsd/os-misc.h
> @@ -1,22 +1,10 @@
>  /*
> - *  miscellaneous FreeBSD system call shims
> + * miscellaneous FreeBSD system call shims
>   *
> - *  Copyright (c) 2013-14 Stacey D. Son
> + * Copyright (c) 2013-2014 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef OS_MISC_H
>  #define OS_MISC_H
>  
> diff --git a/bsd-user/freebsd/os-proc.c b/bsd-user/freebsd/os-proc.c
> index bf993f1b66..0309036178 100644
> --- a/bsd-user/freebsd/os-proc.c
> +++ b/bsd-user/freebsd/os-proc.c
> @@ -1,20 +1,9 @@
>  /*
> - *  FreeBSD process related emulation code
> + * FreeBSD process related emulation code
>   *
> - *  Copyright (c) 2013-15 Stacey D. Son
> + * Copyright (c) 2013-2014 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
>  #include "qemu/osdep.h"
>  
> diff --git a/bsd-user/freebsd/os-proc.h b/bsd-user/freebsd/os-proc.h
> index cc53215138..72ccf23e17 100644
> --- a/bsd-user/freebsd/os-proc.h
> +++ b/bsd-user/freebsd/os-proc.h
> @@ -1,22 +1,10 @@
>  /*
> - *  process related system call shims and definitions
> + * process related system call shims and definitions
>   *
> - *  Copyright (c) 2013-14 Stacey D. Son
> + * Copyright (c) 2013-2014 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef BSD_USER_FREEBSD_OS_PROC_H
>  #define BSD_USER_FREEBSD_OS_PROC_H
>  
> diff --git a/bsd-user/freebsd/os-stat.c b/bsd-user/freebsd/os-stat.c
> index f0f9e609c3..10870430fe 100644
> --- a/bsd-user/freebsd/os-stat.c
> +++ b/bsd-user/freebsd/os-stat.c
> @@ -1,20 +1,9 @@
>  /*
> - *  FreeBSD stat related conversion routines
> + * FreeBSD stat related conversion routines
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
>  #include "qemu/osdep.h"
>  
> diff --git a/bsd-user/freebsd/os-stat.h b/bsd-user/freebsd/os-stat.h
> index 3bdc66aa98..ea95aa6344 100644
> --- a/bsd-user/freebsd/os-stat.h
> +++ b/bsd-user/freebsd/os-stat.h
> @@ -1,22 +1,10 @@
>  /*
> - *  stat related system call shims and definitions
> + * stat related system call shims and definitions
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef BSD_USER_FREEBSD_OS_STAT_H
>  #define BSD_USER_FREEBSD_OS_STAT_H
>  
> diff --git a/bsd-user/freebsd/os-strace.h b/bsd-user/freebsd/os-strace.h
> index a222f093b5..ad48e99db1 100644
> --- a/bsd-user/freebsd/os-strace.h
> +++ b/bsd-user/freebsd/os-strace.h
> @@ -1,25 +1,12 @@
>  /*
> - *  FreeBSD dependent strace print functions
> + * FreeBSD dependent strace print functions
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #include "target_arch_sysarch.h"    /* architecture dependent functions */
>  
> -
>  static inline void do_os_print_sysarch(const struct syscallname *name,
>          abi_long arg1, abi_long arg2, abi_long arg3, abi_long arg4,
>          abi_long arg5, abi_long arg6)
> diff --git a/bsd-user/freebsd/target_os_elf.h b/bsd-user/freebsd/target_os_elf.h
> index 01124979f7..c67e5a0f8e 100644
> --- a/bsd-user/freebsd/target_os_elf.h
> +++ b/bsd-user/freebsd/target_os_elf.h
> @@ -1,22 +1,10 @@
>  /*
> - *  freebsd ELF definitions
> + * FreeBSD ELF definitions
>   *
> - *  Copyright (c) 2013-15 Stacey D. Son
> + * Copyright (c) 2013-2015 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_OS_ELF_H
>  #define TARGET_OS_ELF_H
>  
> diff --git a/bsd-user/freebsd/target_os_siginfo.h b/bsd-user/freebsd/target_os_siginfo.h
> index 6c282d8502..e7cf76b9bd 100644
> --- a/bsd-user/freebsd/target_os_siginfo.h
> +++ b/bsd-user/freebsd/target_os_siginfo.h
> @@ -1,22 +1,10 @@
>  /*
> - *  FreeBSD siginfo related definitions
> + * FreeBSD siginfo related definitions
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_OS_SIGINFO_H
>  #define TARGET_OS_SIGINFO_H
>  
> diff --git a/bsd-user/freebsd/target_os_stack.h b/bsd-user/freebsd/target_os_stack.h
> index ac0ef22cd7..262f33d839 100644
> --- a/bsd-user/freebsd/target_os_stack.h
> +++ b/bsd-user/freebsd/target_os_stack.h
> @@ -1,22 +1,10 @@
>  /*
> - *  FreeBSD setup_initial_stack() implementation.
> + * FreeBSD setup_initial_stack() implementation.
>   *
> - *  Copyright (c) 2013-14 Stacey D. Son
> + * Copyright (c) 2013-2014 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_OS_STACK_H
>  #define TARGET_OS_STACK_H
>  
> diff --git a/bsd-user/freebsd/target_os_thread.h b/bsd-user/freebsd/target_os_thread.h
> index 1b32cebd26..ff88679e40 100644
> --- a/bsd-user/freebsd/target_os_thread.h
> +++ b/bsd-user/freebsd/target_os_thread.h
> @@ -1,22 +1,10 @@
>  /*
> - *  FreeBSD thread dependent code and definitions
> + * FreeBSD thread dependent code and definitions
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_OS_THREAD_H
>  #define TARGET_OS_THREAD_H
>  
> diff --git a/bsd-user/freebsd/target_os_user.h b/bsd-user/freebsd/target_os_user.h
> index 1ca7b5ab17..9703b9a61a 100644
> --- a/bsd-user/freebsd/target_os_user.h
> +++ b/bsd-user/freebsd/target_os_user.h
> @@ -1,22 +1,10 @@
>  /*
> - *  sys/user.h definitions
> + * sys/user.h definitions
>   *
> - *  Copyright (c) 2015 Stacey D. Son (sson at FreeBSD)
> + * Copyright (c) 2015 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_OS_USER_H
>  #define TARGET_OS_USER_H
>  
> diff --git a/bsd-user/freebsd/target_os_vmparam.h b/bsd-user/freebsd/target_os_vmparam.h
> index 8457dd3913..9feec5296d 100644
> --- a/bsd-user/freebsd/target_os_vmparam.h
> +++ b/bsd-user/freebsd/target_os_vmparam.h
> @@ -1,22 +1,10 @@
>  /*
> - *  FreeBSD VM parameters definitions
> + * FreeBSD VM parameters definitions
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_OS_VMPARAM_H
>  #define TARGET_OS_VMPARAM_H
>  
> diff --git a/bsd-user/i386/signal.c b/bsd-user/i386/signal.c
> index a3131047b8..742032090d 100644
> --- a/bsd-user/i386/signal.c
> +++ b/bsd-user/i386/signal.c
> @@ -1,20 +1,9 @@
>  /*
> - *  i386 dependent signal definitions
> + * i386 dependent signal definitions
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
>  
>  #include "qemu/osdep.h"
> diff --git a/bsd-user/i386/target_arch.h b/bsd-user/i386/target_arch.h
> index 9595e60f09..74c8e7fb47 100644
> --- a/bsd-user/i386/target_arch.h
> +++ b/bsd-user/i386/target_arch.h
> @@ -1,22 +1,10 @@
>  /*
>   * Intel x86 specific prototypes for bsd-user
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_H
>  #define TARGET_ARCH_H
>  
> diff --git a/bsd-user/i386/target_arch_cpu.c b/bsd-user/i386/target_arch_cpu.c
> index 2a3af2ddef..fa8ad4b385 100644
> --- a/bsd-user/i386/target_arch_cpu.c
> +++ b/bsd-user/i386/target_arch_cpu.c
> @@ -1,20 +1,9 @@
>  /*
> - *  i386 cpu related code
> + * i386 cpu related code
>   *
> - * Copyright (c) 2013 Stacey Son <sson@FreeBSD.org>
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
>  
>  #include "qemu/osdep.h"
> diff --git a/bsd-user/i386/target_arch_cpu.h b/bsd-user/i386/target_arch_cpu.h
> index f147d5b6f8..c6e8bfd8ca 100644
> --- a/bsd-user/i386/target_arch_cpu.h
> +++ b/bsd-user/i386/target_arch_cpu.h
> @@ -1,21 +1,10 @@
>  /*
> - *  i386 cpu init and loop
> + * i386 cpu init and loop
>   *
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_CPU_H
>  #define TARGET_ARCH_CPU_H
>  
> diff --git a/bsd-user/i386/target_arch_elf.h b/bsd-user/i386/target_arch_elf.h
> index 4ac27b02e7..99cff66a22 100644
> --- a/bsd-user/i386/target_arch_elf.h
> +++ b/bsd-user/i386/target_arch_elf.h
> @@ -1,22 +1,10 @@
>  /*
> - *  i386 ELF definitions
> + * i386 ELF definitions
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_ELF_H
>  #define TARGET_ARCH_ELF_H
>  
> diff --git a/bsd-user/i386/target_arch_reg.h b/bsd-user/i386/target_arch_reg.h
> index 8123109697..cebf2fd5cc 100644
> --- a/bsd-user/i386/target_arch_reg.h
> +++ b/bsd-user/i386/target_arch_reg.h
> @@ -1,23 +1,10 @@
>  /*
> - *  FreeBSD i386 register structures
> + * FreeBSD i386 register structures
>   *
> - *  Copyright (c) 2015 Stacey Son
> - *  All rights reserved.
> + * Copyright (c) 2015 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_REG_H
>  #define TARGET_ARCH_REG_H
>  
> diff --git a/bsd-user/i386/target_arch_signal.h b/bsd-user/i386/target_arch_signal.h
> index 2c14153ab6..070ba4357a 100644
> --- a/bsd-user/i386/target_arch_signal.h
> +++ b/bsd-user/i386/target_arch_signal.h
> @@ -1,19 +1,9 @@
>  /*
> - *  i386 dependent signal definitions
> + * i386 dependent signal definitions
>   *
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
>  #ifndef TARGET_ARCH_SIGNAL_H
>  #define TARGET_ARCH_SIGNAL_H
> diff --git a/bsd-user/i386/target_arch_sigtramp.h b/bsd-user/i386/target_arch_sigtramp.h
> index ef94cc864f..ace243b6f5 100644
> --- a/bsd-user/i386/target_arch_sigtramp.h
> +++ b/bsd-user/i386/target_arch_sigtramp.h
> @@ -1,22 +1,10 @@
>  /*
>   * Intel i386  sigcode for bsd-user
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_SIGTRAMP_H
>  #define TARGET_ARCH_SIGTRAMP_H
>  
> diff --git a/bsd-user/i386/target_arch_sysarch.h b/bsd-user/i386/target_arch_sysarch.h
> index db8fee6380..7b128dfab1 100644
> --- a/bsd-user/i386/target_arch_sysarch.h
> +++ b/bsd-user/i386/target_arch_sysarch.h
> @@ -1,22 +1,10 @@
>  /*
> - *  i386 sysarch system call emulation
> + * i386 sysarch system call emulation
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_SYSARCH_H
>  #define TARGET_ARCH_SYSARCH_H
>  
> diff --git a/bsd-user/i386/target_arch_thread.h b/bsd-user/i386/target_arch_thread.h
> index cee2148d94..8ef4f6b648 100644
> --- a/bsd-user/i386/target_arch_thread.h
> +++ b/bsd-user/i386/target_arch_thread.h
> @@ -1,22 +1,10 @@
>  /*
> - *  i386 thread support
> + * i386 thread support
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_THREAD_H
>  #define TARGET_ARCH_THREAD_H
>  
> diff --git a/bsd-user/i386/target_arch_vmparam.h b/bsd-user/i386/target_arch_vmparam.h
> index 79db420e59..cdf6ab0a49 100644
> --- a/bsd-user/i386/target_arch_vmparam.h
> +++ b/bsd-user/i386/target_arch_vmparam.h
> @@ -1,22 +1,10 @@
>  /*
> - *  i386 VM parameters definitions
> + * i386 VM parameters definitions
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_VMPARAM_H
>  #define TARGET_ARCH_VMPARAM_H
>  
> diff --git a/bsd-user/i386/target_syscall.h b/bsd-user/i386/target_syscall.h
> index 940c687a52..a52851f635 100644
> --- a/bsd-user/i386/target_syscall.h
> +++ b/bsd-user/i386/target_syscall.h
> @@ -1,19 +1,9 @@
>  /*
> - *  i386 system call definitions
> + * i386 system call definitions
>   *
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
>  #ifndef TARGET_SYSCALL_H
>  #define TARGET_SYSCALL_H
> diff --git a/bsd-user/main.c b/bsd-user/main.c
> index 73aae8c327..84351e1631 100644
> --- a/bsd-user/main.c
> +++ b/bsd-user/main.c
> @@ -1,23 +1,11 @@
>  /*
> - *  qemu bsd user main
> + * qemu bsd user main
>   *
> - *  Copyright (c) 2003-2008 Fabrice Bellard
> - *  Copyright (c) 2013-14 Stacey Son
> + * Copyright (c) 2003-2008 Fabrice Bellard
> + * Copyright (c) 2013-14 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #include "qemu/osdep.h"
>  #include <sys/resource.h>
>  #include <sys/sysctl.h>
> diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
> index 24ba1728eb..fb685e84aa 100644
> --- a/bsd-user/mmap.c
> +++ b/bsd-user/mmap.c
> @@ -1,20 +1,9 @@
>  /*
> - *  mmap support for qemu
> + * mmap support for qemu
>   *
> - *  Copyright (c) 2003 - 2008 Fabrice Bellard
> + * Copyright (c) 2003 - 2008 Fabrice Bellard
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
>  #include "qemu/osdep.h"
>  #include "exec/mmap-lock.h"
> diff --git a/bsd-user/qemu-bsd.h b/bsd-user/qemu-bsd.h
> index 56affcd31d..64d4fbe3a9 100644
> --- a/bsd-user/qemu-bsd.h
> +++ b/bsd-user/qemu-bsd.h
> @@ -1,22 +1,10 @@
>  /*
> - *  BSD conversion extern declarations
> + * BSD conversion extern declarations
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef QEMU_BSD_H
>  #define QEMU_BSD_H
>  
> diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
> index 93388e7c34..c4ff1fb0eb 100644
> --- a/bsd-user/qemu.h
> +++ b/bsd-user/qemu.h
> @@ -1,18 +1,9 @@
>  /*
> - *  qemu bsd user mode definition
> + * qemu bsd user mode definition
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
>  #ifndef QEMU_H
>  #define QEMU_H
> diff --git a/bsd-user/signal.c b/bsd-user/signal.c
> index dadcc037dc..832ffef7c5 100644
> --- a/bsd-user/signal.c
> +++ b/bsd-user/signal.c
> @@ -1,21 +1,10 @@
>  /*
> - *  Emulation of BSD signals
> + * Emulation of BSD signals
>   *
> - *  Copyright (c) 2003 - 2008 Fabrice Bellard
> - *  Copyright (c) 2013 Stacey Son
> + * Copyright (c) 2003 - 2008 Fabrice Bellard
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
>  
>  #include "qemu/osdep.h"
> diff --git a/bsd-user/strace.c b/bsd-user/strace.c
> index 6dc01d3be7..a015bfddba 100644
> --- a/bsd-user/strace.c
> +++ b/bsd-user/strace.c
> @@ -1,19 +1,9 @@
>  /*
> - *  System call tracing and debugging
> + * System call tracing and debugging
>   *
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
>  
>  #include "qemu/osdep.h"
> diff --git a/bsd-user/syscall_defs.h b/bsd-user/syscall_defs.h
> index cc4b484f3a..a2ded2fac1 100644
> --- a/bsd-user/syscall_defs.h
> +++ b/bsd-user/syscall_defs.h
> @@ -1,22 +1,10 @@
>  /*
> - *  System call related declarations
> + * System call related declarations
>   *
> - *  Copyright (c) 2013-15 Stacey D. Son (sson at FreeBSD)
> + * Copyright (c) 2013-2015 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef SYSCALL_DEFS_H
>  #define SYSCALL_DEFS_H
>  
> diff --git a/bsd-user/x86_64/signal.c b/bsd-user/x86_64/signal.c
> index 46cb865180..823d7217ad 100644
> --- a/bsd-user/x86_64/signal.c
> +++ b/bsd-user/x86_64/signal.c
> @@ -1,19 +1,9 @@
>  /*
> - *  x86_64 signal definitions
> + * x86_64 signal definitions
>   *
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
>  
>  #include "qemu/osdep.h"
> diff --git a/bsd-user/x86_64/target_arch.h b/bsd-user/x86_64/target_arch.h
> index 09bd974889..177e6b442a 100644
> --- a/bsd-user/x86_64/target_arch.h
> +++ b/bsd-user/x86_64/target_arch.h
> @@ -1,22 +1,10 @@
>  /*
>   * Intel x86_64 specific prototypes for bsd-user
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_H
>  #define TARGET_ARCH_H
>  
> diff --git a/bsd-user/x86_64/target_arch_cpu.c b/bsd-user/x86_64/target_arch_cpu.c
> index 1d32f18907..aeeb1235c9 100644
> --- a/bsd-user/x86_64/target_arch_cpu.c
> +++ b/bsd-user/x86_64/target_arch_cpu.c
> @@ -1,20 +1,9 @@
>  /*
> - *  x86_64 cpu related code
> + * x86_64 cpu related code
>   *
> - * Copyright (c) 2013 Stacey Son <sson@FreeBSD.org>
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
>  
>  #include "qemu/osdep.h"
> diff --git a/bsd-user/x86_64/target_arch_cpu.h b/bsd-user/x86_64/target_arch_cpu.h
> index 1fa71d87f1..f12a8ab49e 100644
> --- a/bsd-user/x86_64/target_arch_cpu.h
> +++ b/bsd-user/x86_64/target_arch_cpu.h
> @@ -1,21 +1,10 @@
>  /*
> - *  x86_64 cpu init and loop
> + * x86_64 cpu init and loop
>   *
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_CPU_H
>  #define TARGET_ARCH_CPU_H
>  
> diff --git a/bsd-user/x86_64/target_arch_elf.h b/bsd-user/x86_64/target_arch_elf.h
> index e51c2faf08..020533904e 100644
> --- a/bsd-user/x86_64/target_arch_elf.h
> +++ b/bsd-user/x86_64/target_arch_elf.h
> @@ -1,22 +1,10 @@
>  /*
> - *  x86_64 ELF definitions
> + * x86_64 ELF definitions
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2015 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_ELF_H
>  #define TARGET_ARCH_ELF_H
>  
> diff --git a/bsd-user/x86_64/target_arch_reg.h b/bsd-user/x86_64/target_arch_reg.h
> index 7a766de918..c0c766ac1a 100644
> --- a/bsd-user/x86_64/target_arch_reg.h
> +++ b/bsd-user/x86_64/target_arch_reg.h
> @@ -1,23 +1,10 @@
>  /*
> - *  FreeBSD amd64 register structures
> + * FreeBSD amd64 register structures
>   *
> - *  Copyright (c) 2015 Stacey Son
> - *  All rights reserved.
> + * Copyright (c) 2015 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_REG_H
>  #define TARGET_ARCH_REG_H
>  
> diff --git a/bsd-user/x86_64/target_arch_signal.h b/bsd-user/x86_64/target_arch_signal.h
> index f833ee66ce..2b63048f8b 100644
> --- a/bsd-user/x86_64/target_arch_signal.h
> +++ b/bsd-user/x86_64/target_arch_signal.h
> @@ -1,21 +1,10 @@
>  /*
> - *  x86_64 signal definitions
> + * x86_64 signal definitions
>   *
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_SIGNAL_H
>  #define TARGET_ARCH_SIGNAL_H
>  
> diff --git a/bsd-user/x86_64/target_arch_sigtramp.h b/bsd-user/x86_64/target_arch_sigtramp.h
> index 01da614098..cab22fb7e8 100644
> --- a/bsd-user/x86_64/target_arch_sigtramp.h
> +++ b/bsd-user/x86_64/target_arch_sigtramp.h
> @@ -1,29 +1,16 @@
>  /*
>   * Intel x86_64  sigcode for bsd-user
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_SIGTRAMP_H
>  #define TARGET_ARCH_SIGTRAMP_H
>  
>  static inline abi_long setup_sigtramp(abi_ulong offset, unsigned sigf_uc,
>          unsigned sys_sigreturn)
>  {
> -
>      return 0;
>  }
>  #endif /* TARGET_ARCH_SIGTRAMP_H */
> diff --git a/bsd-user/x86_64/target_arch_sysarch.h b/bsd-user/x86_64/target_arch_sysarch.h
> index 152cb8bcb8..3a6f74161f 100644
> --- a/bsd-user/x86_64/target_arch_sysarch.h
> +++ b/bsd-user/x86_64/target_arch_sysarch.h
> @@ -1,21 +1,10 @@
>  /*
> - *  x86_64 sysarch() syscall emulation
> + * x86_64 sysarch() syscall emulation
>   *
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_SYSARCH_H
>  #define TARGET_ARCH_SYSARCH_H
>  
> diff --git a/bsd-user/x86_64/target_arch_thread.h b/bsd-user/x86_64/target_arch_thread.h
> index 7739bb2154..176c347037 100644
> --- a/bsd-user/x86_64/target_arch_thread.h
> +++ b/bsd-user/x86_64/target_arch_thread.h
> @@ -1,22 +1,10 @@
>  /*
> - *  x86_64 thread support
> + * x86_64 thread support
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_THREAD_H
>  #define TARGET_ARCH_THREAD_H
>  
> diff --git a/bsd-user/x86_64/target_arch_vmparam.h b/bsd-user/x86_64/target_arch_vmparam.h
> index 6797623a6b..8919c5e6e5 100644
> --- a/bsd-user/x86_64/target_arch_vmparam.h
> +++ b/bsd-user/x86_64/target_arch_vmparam.h
> @@ -1,22 +1,10 @@
>  /*
> - *  Intel x86_64 VM parameters definitions
> + * Intel x86_64 VM parameters definitions
>   *
> - *  Copyright (c) 2013 Stacey D. Son
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
> -
>  #ifndef TARGET_ARCH_VMPARAM_H
>  #define TARGET_ARCH_VMPARAM_H
>  
> diff --git a/bsd-user/x86_64/target_syscall.h b/bsd-user/x86_64/target_syscall.h
> index a8e6274b76..5adced9bde 100644
> --- a/bsd-user/x86_64/target_syscall.h
> +++ b/bsd-user/x86_64/target_syscall.h
> @@ -1,19 +1,9 @@
>  /*
> - *  x86_64 system call definitions
> + * x86_64 system call definitions
>   *
> + * Copyright (c) 2013 Stacey D. Son
>   *
> - *  This program is free software; you can redistribute it and/or modify
> - *  it under the terms of the GNU General Public License as published by
> - *  the Free Software Foundation; either version 2 of the License, or
> - *  (at your option) any later version.
> - *
> - *  This program is distributed in the hope that it will be useful,
> - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *  GNU General Public License for more details.
> - *
> - *  You should have received a copy of the GNU General Public License
> - *  along with this program; if not, see <http://www.gnu.org/licenses/>.
> + * SPDX-License-Identifier: GPL-2.0-or-later
>   */
>  #ifndef TARGET_SYSCALL_H
>  #define TARGET_SYSCALL_H
> 
> ---
> base-commit: ffcf1a7981793973ffbd8100a7c3c6042d02ae23
> change-id: 20260302-bsd-user-copyright-3a46d2307150
> 
> Best regards,
> -- 
> Warner Losh <imp@bsdimp.com>
> 
> 

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 :|
Re: [PATCH] bsd-user: Switch to SPDX-License-Expression
Posted by Warner Losh 1 month, 1 week ago 
On Tue, Mar 3, 2026 at 1:51 AM Daniel P. Berrangé <berrange@redhat.com>
wrote:

> On Mon, Mar 02, 2026 at 09:46:06PM -0700, Warner Losh wrote:
> > Switch all the files over to using SPDX. This also corrects various
> > small errors in the form of the copyright messages. It adds copyright to
> > those files that lack it. There's no functional change.
> >
> > Signed-off-by: Stacey Son <sson@FreeBSD.org>
> > Signed-off-by: Warner Losh <imp@bsdimp.com>
> > ---
> > Since I'll be upstreaming more files from bsd-user, and since qemu now
> > requires SPDX and prohibits boilerplate, this will make it easier. I've
> > converted all the relevant bits in bsd-user upstream.
>
> Note, QEMU / checkpatch.pl only requires SDPX on *newly* authored files.
> Existing code files, or new files whose content is copied from an
> existing file (either inside or outside QEMU git) are exempt from this
> and in fact required to be left without SPDX.
>
> The reasoning is that there is some uncertainty about the legality of
> removing license header text from existing files due to the GPL clause
> 1 which says
>
>   "keep intact all the notices that refer to this License and
>    to the absence of any warranty;"
>
> I interpret that to mean we can not remove license header text from
> files unless the person doing the removal is the exclusive copyright
> holder, or has got recorded permission from all copyright holders
> that apply to each file changed.
>
> It is confusing for people because Linux removed all their GPL header
> text in favour of SPDX, but never provided any clear explanation of
> why they considered that to be acceptable from the GPL compliance POV.
>

So I have Stacey's permission to do this, and he's the only actual copyright
holder on these files. If I messed up on any, specifically, please let me
know.
That's why I included his signed-off-by: he signed off on it and that he's
legally
able to make the change.

Also, I did this to reduce friction in upstreaming bsd-user which has been
going on for 6ish years now. The SPDX rule is one more thing that slows
that down. Rather than get an exception to the rule, I brought everything
into compliance so it isn't yet another issue that takes more time because
I forgot to do it for a specific patch series. The more issues I have to
have
on my checklist, the more the works are gummed up and the slower the
progress is. We still have somethign like ~30k lines to go last I checked.

Also, these files have also been out of tree for over a decade. The new
rule forces me to do what you're complaining about the Linux tree doing:
remove GPL markings to get it into your tree. Well which is it?  Either it's
wrong and I shouldn't have to do it for the old files.  Or what I've done
is proper since it's uniform. Your tree is just an arbitrary repo of these
files, and isn't special in any meaningful way. So I'm in a no-win situation
here by your argument.

Also, when I talk about a burdensome and cumbersome upstreaming process,
this is yet another example. An arbitrary rule that causes friction, but
provides
no actual benefit. It's like the style rules: I have to arbitrarily
reformat code that
is like that in linux-user because this is "new code". So I spend a fair
amount of
time fetching different stones to obey the rules, but since now the code is
different
it becomes harder to track linux-user or to ever converge them. Change for
the
sake of compliance with an arbitrary rule that doesn't apply elsewhere (for
whatever
reason) is one of the death by a thousand cuts I, and others doing this
work, have
been suffering for far too long. It's in large measure why things aren't
further along:
it steals what little time I have for this and it demotivates further work
for a while.

Note: I'm specifically not complaining about the code review that finds
actual
problems. That's quite useful and has improved the quality. So I've not
tried to do
any 'maintainer reviewed' end-run around this process since it has been
helpful,
though also timeconsuming at times.

So, having said that, is there any specific objection to anything I've
done? Given
Stacey's explicit blessing of this change (you'll recall from the patch
series I just did
I waited until I had contacted him before I changing it there), did I mess
up anywhere?

Warner


> > ---
> >  bsd-user/aarch64/signal.c               | 15 ++-------------
> >  bsd-user/aarch64/target_arch.h          | 16 ++--------------
> >  bsd-user/aarch64/target_arch_cpu.c      | 15 ++-------------
> >  bsd-user/aarch64/target_arch_cpu.h      | 18 +++---------------
> >  bsd-user/aarch64/target_arch_elf.h      | 14 +-------------
> >  bsd-user/aarch64/target_arch_reg.h      | 19 +++----------------
> >  bsd-user/aarch64/target_arch_signal.h   | 16 ++--------------
> >  bsd-user/aarch64/target_arch_sigtramp.h | 16 ++--------------
> >  bsd-user/aarch64/target_arch_sysarch.h  | 16 ++--------------
> >  bsd-user/aarch64/target_arch_thread.h   | 16 ++--------------
> >  bsd-user/aarch64/target_arch_vmparam.h  | 16 ++--------------
> >  bsd-user/aarch64/target_syscall.h       | 16 ++--------------
> >  bsd-user/arm/signal.c                   | 18 +++---------------
> >  bsd-user/arm/target_arch.h              | 16 ++--------------
> >  bsd-user/arm/target_arch_cpu.c          | 18 +++---------------
> >  bsd-user/arm/target_arch_cpu.h          | 18 +++---------------
> >  bsd-user/arm/target_arch_elf.h          | 18 +++---------------
> >  bsd-user/arm/target_arch_reg.h          | 18 +++---------------
> >  bsd-user/arm/target_arch_signal.h       | 18 +++---------------
> >  bsd-user/arm/target_arch_sigtramp.h     | 18 +++---------------
> >  bsd-user/arm/target_arch_sysarch.h      | 18 +++---------------
> >  bsd-user/arm/target_arch_thread.h       | 18 +++---------------
> >  bsd-user/arm/target_arch_vmparam.h      | 18 +++---------------
> >  bsd-user/arm/target_syscall.h           | 18 +++---------------
> >  bsd-user/bsd-file.h                     | 18 +++---------------
> >  bsd-user/bsd-mem.c                      | 17 +++--------------
> >  bsd-user/bsd-mem.h                      | 17 +++--------------
> >  bsd-user/bsd-proc.c                     | 17 +++--------------
> >  bsd-user/bsd-proc.h                     | 17 +++--------------
> >  bsd-user/bsdload.c                      | 17 +++--------------
> >  bsd-user/elfload.c                      | 17 +++--------------
> >  bsd-user/freebsd/os-misc.h              | 18 +++---------------
> >  bsd-user/freebsd/os-proc.c              | 17 +++--------------
> >  bsd-user/freebsd/os-proc.h              | 18 +++---------------
> >  bsd-user/freebsd/os-stat.c              | 17 +++--------------
> >  bsd-user/freebsd/os-stat.h              | 18 +++---------------
> >  bsd-user/freebsd/os-strace.h            | 19 +++----------------
> >  bsd-user/freebsd/target_os_elf.h        | 18 +++---------------
> >  bsd-user/freebsd/target_os_siginfo.h    | 18 +++---------------
> >  bsd-user/freebsd/target_os_stack.h      | 18 +++---------------
> >  bsd-user/freebsd/target_os_thread.h     | 18 +++---------------
> >  bsd-user/freebsd/target_os_user.h       | 18 +++---------------
> >  bsd-user/freebsd/target_os_vmparam.h    | 18 +++---------------
> >  bsd-user/i386/signal.c                  | 17 +++--------------
> >  bsd-user/i386/target_arch.h             | 16 ++--------------
> >  bsd-user/i386/target_arch_cpu.c         | 17 +++--------------
> >  bsd-user/i386/target_arch_cpu.h         | 17 +++--------------
> >  bsd-user/i386/target_arch_elf.h         | 18 +++---------------
> >  bsd-user/i386/target_arch_reg.h         | 19 +++----------------
> >  bsd-user/i386/target_arch_signal.h      | 16 +++-------------
> >  bsd-user/i386/target_arch_sigtramp.h    | 16 ++--------------
> >  bsd-user/i386/target_arch_sysarch.h     | 18 +++---------------
> >  bsd-user/i386/target_arch_thread.h      | 18 +++---------------
> >  bsd-user/i386/target_arch_vmparam.h     | 18 +++---------------
> >  bsd-user/i386/target_syscall.h          | 16 +++-------------
> >  bsd-user/main.c                         | 20 ++++----------------
> >  bsd-user/mmap.c                         | 17 +++--------------
> >  bsd-user/qemu-bsd.h                     | 18 +++---------------
> >  bsd-user/qemu.h                         | 15 +++------------
> >  bsd-user/signal.c                       | 19 ++++---------------
> >  bsd-user/strace.c                       | 16 +++-------------
> >  bsd-user/syscall_defs.h                 | 18 +++---------------
> >  bsd-user/x86_64/signal.c                | 16 +++-------------
> >  bsd-user/x86_64/target_arch.h           | 16 ++--------------
> >  bsd-user/x86_64/target_arch_cpu.c       | 17 +++--------------
> >  bsd-user/x86_64/target_arch_cpu.h       | 17 +++--------------
> >  bsd-user/x86_64/target_arch_elf.h       | 18 +++---------------
> >  bsd-user/x86_64/target_arch_reg.h       | 19 +++----------------
> >  bsd-user/x86_64/target_arch_signal.h    | 17 +++--------------
> >  bsd-user/x86_64/target_arch_sigtramp.h  | 17 ++---------------
> >  bsd-user/x86_64/target_arch_sysarch.h   | 17 +++--------------
> >  bsd-user/x86_64/target_arch_thread.h    | 18 +++---------------
> >  bsd-user/x86_64/target_arch_vmparam.h   | 18 +++---------------
> >  bsd-user/x86_64/target_syscall.h        | 16 +++-------------
> >  74 files changed, 208 insertions(+), 1069 deletions(-)
> >
> > diff --git a/bsd-user/aarch64/signal.c b/bsd-user/aarch64/signal.c
> > index 6bc73a798f..ad19e5144e 100644
> > --- a/bsd-user/aarch64/signal.c
> > +++ b/bsd-user/aarch64/signal.c
> > @@ -1,20 +1,9 @@
> >  /*
> >   * ARM AArch64 specific signal definitions for bsd-user
> >   *
> > - * Copyright (c) 2015 Stacey D. Son <sson at FreeBSD>
> > + * Copyright (c) 2015 Stacey D. Son
> >   *
> > - * This library is free software; you can redistribute it and/or
> > - * modify it under the terms of the GNU Lesser General Public
> > - * License as published by the Free Software Foundation; either
> > - * version 2 of the License, or (at your option) any later version.
> > - *
> > - * This library is distributed in the hope that it will be useful,
> > - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> > - * Lesser General Public License for more details.
> > - *
> > - * You should have received a copy of the GNU Lesser General Public
> > - * License along with this library; if not, see <
> http://www.gnu.org/licenses/>.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> >  #include "qemu/osdep.h"
> >
> > diff --git a/bsd-user/aarch64/target_arch.h
> b/bsd-user/aarch64/target_arch.h
> > index 4815a56ae3..7861233889 100644
> > --- a/bsd-user/aarch64/target_arch.h
> > +++ b/bsd-user/aarch64/target_arch.h
> > @@ -1,22 +1,10 @@
> >  /*
> >   * ARM AArch64 specific prototypes for bsd-user
> >   *
> > - * Copyright (c) 2015 Stacey D. Son <sson at FreeBSD>
> > + * Copyright (c) 2015 Stacey D. Son
> >   *
> > - * This library is free software; you can redistribute it and/or
> > - * modify it under the terms of the GNU Lesser General Public
> > - * License as published by the Free Software Foundation; either
> > - * version 2 of the License, or (at your option) any later version.
> > - *
> > - * This library is distributed in the hope that it will be useful,
> > - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> > - * Lesser General Public License for more details.
> > - *
> > - * You should have received a copy of the GNU Lesser General Public
> > - * License along with this library; if not, see <
> http://www.gnu.org/licenses/>.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_H
> >  #define TARGET_ARCH_H
> >
> > diff --git a/bsd-user/aarch64/target_arch_cpu.c
> b/bsd-user/aarch64/target_arch_cpu.c
> > index b2fa59efaf..6e9519e1b0 100644
> > --- a/bsd-user/aarch64/target_arch_cpu.c
> > +++ b/bsd-user/aarch64/target_arch_cpu.c
> > @@ -1,20 +1,9 @@
> >  /*
> >   * ARM AArch64 specific CPU for bsd-user
> >   *
> > - * Copyright (c) 2015 Stacey Son
> > + * Copyright (c) 2015 Stacey D. Son
> >   *
> > - * This library is free software; you can redistribute it and/or
> > - * modify it under the terms of the GNU Lesser General Public
> > - * License as published by the Free Software Foundation; either
> > - * version 2 of the License, or (at your option) any later version.
> > - *
> > - * This library is distributed in the hope that it will be useful,
> > - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> > - * Lesser General Public License for more details.
> > - *
> > - * You should have received a copy of the GNU Lesser General Public
> > - * License along with this library; if not, see <
> http://www.gnu.org/licenses/>.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> >  #include "qemu/osdep.h"
> >  #include "target_arch.h"
> > diff --git a/bsd-user/aarch64/target_arch_cpu.h
> b/bsd-user/aarch64/target_arch_cpu.h
> > index 15df84fda2..09d942b040 100644
> > --- a/bsd-user/aarch64/target_arch_cpu.h
> > +++ b/bsd-user/aarch64/target_arch_cpu.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  ARM AArch64 cpu init and loop
> > + * ARM AArch64 cpu init and loop
> >   *
> > - * Copyright (c) 2015 Stacey Son
> > + * Copyright (c) 2015 Stacey D. Son
> >   *
> > - * This library is free software; you can redistribute it and/or
> > - * modify it under the terms of the GNU Lesser General Public
> > - * License as published by the Free Software Foundation; either
> > - * version 2 of the License, or (at your option) any later version.
> > - *
> > - * This library is distributed in the hope that it will be useful,
> > - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> > - * Lesser General Public License for more details.
> > - *
> > - * You should have received a copy of the GNU Lesser General Public
> > - * License along with this library; if not, see <
> http://www.gnu.org/licenses/>.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_CPU_H
> >  #define TARGET_ARCH_CPU_H
> >
> > diff --git a/bsd-user/aarch64/target_arch_elf.h
> b/bsd-user/aarch64/target_arch_elf.h
> > index cec254f88b..5ea5232a57 100644
> > --- a/bsd-user/aarch64/target_arch_elf.h
> > +++ b/bsd-user/aarch64/target_arch_elf.h
> > @@ -3,20 +3,8 @@
> >   *
> >   * Copyright (c) 2015 Stacey D. Son
> >   *
> > - * This library is free software; you can redistribute it and/or
> > - * modify it under the terms of the GNU Lesser General Public
> > - * License as published by the Free Software Foundation; either
> > - * version 2 of the License, or (at your option) any later version.
> > - *
> > - * This library is distributed in the hope that it will be useful,
> > - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> > - * Lesser General Public License for more details.
> > - *
> > - * You should have received a copy of the GNU Lesser General Public
> > - * License along with this library; if not, see <
> http://www.gnu.org/licenses/>.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_ELF_H
> >  #define TARGET_ARCH_ELF_H
> >
> > diff --git a/bsd-user/aarch64/target_arch_reg.h
> b/bsd-user/aarch64/target_arch_reg.h
> > index b53302e7f7..9cca3c0ea0 100644
> > --- a/bsd-user/aarch64/target_arch_reg.h
> > +++ b/bsd-user/aarch64/target_arch_reg.h
> > @@ -1,23 +1,10 @@
> >  /*
> > - *  FreeBSD arm64 register structures
> > + * FreeBSD arm64 register structures
> >   *
> > - *  Copyright (c) 2015 Stacey Son
> > - *  All rights reserved.
> > + * Copyright (c) 2015 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_REG_H
> >  #define TARGET_ARCH_REG_H
> >
> > diff --git a/bsd-user/aarch64/target_arch_signal.h
> b/bsd-user/aarch64/target_arch_signal.h
> > index b72ba7aa50..6085217546 100644
> > --- a/bsd-user/aarch64/target_arch_signal.h
> > +++ b/bsd-user/aarch64/target_arch_signal.h
> > @@ -1,22 +1,10 @@
> >  /*
> >   * ARM AArch64 specific signal definitions for bsd-user
> >   *
> > - * Copyright (c) 2015 Stacey D. Son <sson at FreeBSD>
> > + * Copyright (c) 2015 Stacey D. Son
> >   *
> > - * This library is free software; you can redistribute it and/or
> > - * modify it under the terms of the GNU Lesser General Public
> > - * License as published by the Free Software Foundation; either
> > - * version 2 of the License, or (at your option) any later version.
> > - *
> > - * This library is distributed in the hope that it will be useful,
> > - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> > - * Lesser General Public License for more details.
> > - *
> > - * You should have received a copy of the GNU Lesser General Public
> > - * License along with this library; if not, see <
> http://www.gnu.org/licenses/>.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_SIGNAL_H
> >  #define TARGET_ARCH_SIGNAL_H
> >
> > diff --git a/bsd-user/aarch64/target_arch_sigtramp.h
> b/bsd-user/aarch64/target_arch_sigtramp.h
> > index 8cdd33b621..38a447fc25 100644
> > --- a/bsd-user/aarch64/target_arch_sigtramp.h
> > +++ b/bsd-user/aarch64/target_arch_sigtramp.h
> > @@ -1,22 +1,10 @@
> >  /*
> >   * ARM AArch64 sigcode for bsd-user
> >   *
> > - * Copyright (c) 2015 Stacey D. Son <sson at FreeBSD>
> > + * Copyright (c) 2015 Stacey D. Son
> >   *
> > - * This library is free software; you can redistribute it and/or
> > - * modify it under the terms of the GNU Lesser General Public
> > - * License as published by the Free Software Foundation; either
> > - * version 2 of the License, or (at your option) any later version.
> > - *
> > - * This library is distributed in the hope that it will be useful,
> > - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> > - * Lesser General Public License for more details.
> > - *
> > - * You should have received a copy of the GNU Lesser General Public
> > - * License along with this library; if not, see <
> http://www.gnu.org/licenses/>.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_SIGTRAMP_H
> >  #define TARGET_ARCH_SIGTRAMP_H
> >
> > diff --git a/bsd-user/aarch64/target_arch_sysarch.h
> b/bsd-user/aarch64/target_arch_sysarch.h
> > index b003015daf..5569c996cb 100644
> > --- a/bsd-user/aarch64/target_arch_sysarch.h
> > +++ b/bsd-user/aarch64/target_arch_sysarch.h
> > @@ -1,22 +1,10 @@
> >  /*
> >   * ARM AArch64 sysarch() system call emulation for bsd-user.
> >   *
> > - * Copyright (c) 2015 <sson at FreeBSD>
> > + * Copyright (c) 2015 Stacey D. Son
> >   *
> > - * This library is free software; you can redistribute it and/or
> > - * modify it under the terms of the GNU Lesser General Public
> > - * License as published by the Free Software Foundation; either
> > - * version 2 of the License, or (at your option) any later version.
> > - *
> > - * This library is distributed in the hope that it will be useful,
> > - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> > - * Lesser General Public License for more details.
> > - *
> > - * You should have received a copy of the GNU Lesser General Public
> > - * License along with this library; if not, see <
> http://www.gnu.org/licenses/>.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_SYSARCH_H
> >  #define TARGET_ARCH_SYSARCH_H
> >
> > diff --git a/bsd-user/aarch64/target_arch_thread.h
> b/bsd-user/aarch64/target_arch_thread.h
> > index 4c911e605a..06676980c9 100644
> > --- a/bsd-user/aarch64/target_arch_thread.h
> > +++ b/bsd-user/aarch64/target_arch_thread.h
> > @@ -1,22 +1,10 @@
> >  /*
> >   * ARM AArch64 thread support for bsd-user.
> >   *
> > - * Copyright (c) 2015 Stacey D. Son <sson at FreeBSD>
> > + * Copyright (c) 2015 Stacey D. Son
> >   *
> > - * This library is free software; you can redistribute it and/or
> > - * modify it under the terms of the GNU Lesser General Public
> > - * License as published by the Free Software Foundation; either
> > - * version 2 of the License, or (at your option) any later version.
> > - *
> > - * This library is distributed in the hope that it will be useful,
> > - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> > - * Lesser General Public License for more details.
> > - *
> > - * You should have received a copy of the GNU Lesser General Public
> > - * License along with this library; if not, see <
> http://www.gnu.org/licenses/>.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_THREAD_H
> >  #define TARGET_ARCH_THREAD_H
> >
> > diff --git a/bsd-user/aarch64/target_arch_vmparam.h
> b/bsd-user/aarch64/target_arch_vmparam.h
> > index 0c35491970..ea32f5b56d 100644
> > --- a/bsd-user/aarch64/target_arch_vmparam.h
> > +++ b/bsd-user/aarch64/target_arch_vmparam.h
> > @@ -1,22 +1,10 @@
> >  /*
> >   * ARM AArch64 VM parameters definitions for bsd-user.
> >   *
> > - * Copyright (c) 2015 Stacey D. Son <sson at FreeBSD>
> > + * Copyright (c) 2015 Stacey D. Son
> >   *
> > - * This library is free software; you can redistribute it and/or
> > - * modify it under the terms of the GNU Lesser General Public
> > - * License as published by the Free Software Foundation; either
> > - * version 2 of the License, or (at your option) any later version.
> > - *
> > - * This library is distributed in the hope that it will be useful,
> > - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> > - * Lesser General Public License for more details.
> > - *
> > - * You should have received a copy of the GNU Lesser General Public
> > - * License along with this library; if not, see <
> http://www.gnu.org/licenses/>.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_VMPARAM_H
> >  #define TARGET_ARCH_VMPARAM_H
> >
> > diff --git a/bsd-user/aarch64/target_syscall.h
> b/bsd-user/aarch64/target_syscall.h
> > index 08ae913c42..a574edc429 100644
> > --- a/bsd-user/aarch64/target_syscall.h
> > +++ b/bsd-user/aarch64/target_syscall.h
> > @@ -1,22 +1,10 @@
> >  /*
> >   * ARM AArch64 specific CPU for bsd-user
> >   *
> > - * Copyright (c) 2015 Stacey D. Son <sson at Freebsd>
> > + * Copyright (c) 2015 Stacey D. Son
> >   *
> > - * This library is free software; you can redistribute it and/or
> > - * modify it under the terms of the GNU Lesser General Public
> > - * License as published by the Free Software Foundation; either
> > - * version 2 of the License, or (at your option) any later version.
> > - *
> > - * This library is distributed in the hope that it will be useful,
> > - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> > - * Lesser General Public License for more details.
> > - *
> > - * You should have received a copy of the GNU Lesser General Public
> > - * License along with this library; if not, see <
> http://www.gnu.org/licenses/>.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef BSD_USER_AARCH64_TARGET_SYSCALL_H
> >  #define BSD_USER_AARCH64_TARGET_SYSCALL_H
> >
> > diff --git a/bsd-user/arm/signal.c b/bsd-user/arm/signal.c
> > index 9734407543..35cedeba06 100644
> > --- a/bsd-user/arm/signal.c
> > +++ b/bsd-user/arm/signal.c
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  arm signal functions
> > + * arm signal functions
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #include "qemu/osdep.h"
> >  #include "qemu.h"
> >
> > diff --git a/bsd-user/arm/target_arch.h b/bsd-user/arm/target_arch.h
> > index d80cb85c64..e0add162e8 100644
> > --- a/bsd-user/arm/target_arch.h
> > +++ b/bsd-user/arm/target_arch.h
> > @@ -1,22 +1,10 @@
> >  /*
> >   * ARM 32-bit specific prototypes for bsd-user
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_H
> >  #define TARGET_ARCH_H
> >
> > diff --git a/bsd-user/arm/target_arch_cpu.c
> b/bsd-user/arm/target_arch_cpu.c
> > index fe38ae2210..6a4f5cec0e 100644
> > --- a/bsd-user/arm/target_arch_cpu.c
> > +++ b/bsd-user/arm/target_arch_cpu.c
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  arm cpu related code
> > + * arm cpu related code
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #include "qemu/osdep.h"
> >  #include "target_arch.h"
> >
> > diff --git a/bsd-user/arm/target_arch_cpu.h
> b/bsd-user/arm/target_arch_cpu.h
> > index 9a952ef0ff..faef3ea17a 100644
> > --- a/bsd-user/arm/target_arch_cpu.h
> > +++ b/bsd-user/arm/target_arch_cpu.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  arm cpu init and loop
> > + * arm cpu init and loop
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_CPU_H
> >  #define TARGET_ARCH_CPU_H
> >
> > diff --git a/bsd-user/arm/target_arch_elf.h
> b/bsd-user/arm/target_arch_elf.h
> > index b54bf5fbc6..fd13bc87f4 100644
> > --- a/bsd-user/arm/target_arch_elf.h
> > +++ b/bsd-user/arm/target_arch_elf.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  arm ELF definitions
> > + * arm ELF definitions
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_ELF_H
> >  #define TARGET_ARCH_ELF_H
> >
> > diff --git a/bsd-user/arm/target_arch_reg.h
> b/bsd-user/arm/target_arch_reg.h
> > index 070fa24da1..9d23dda27d 100644
> > --- a/bsd-user/arm/target_arch_reg.h
> > +++ b/bsd-user/arm/target_arch_reg.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  FreeBSD arm register structures
> > + * FreeBSD arm register structures
> >   *
> > - *  Copyright (c) 2015 Stacey Son
> > + * Copyright (c) 2015 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_REG_H
> >  #define TARGET_ARCH_REG_H
> >
> > diff --git a/bsd-user/arm/target_arch_signal.h
> b/bsd-user/arm/target_arch_signal.h
> > index 10f96b8bfc..dfaefa25d1 100644
> > --- a/bsd-user/arm/target_arch_signal.h
> > +++ b/bsd-user/arm/target_arch_signal.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  arm signal definitions
> > + * arm signal definitions
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_SIGNAL_H
> >  #define TARGET_ARCH_SIGNAL_H
> >
> > diff --git a/bsd-user/arm/target_arch_sigtramp.h
> b/bsd-user/arm/target_arch_sigtramp.h
> > index 06198045ed..8a2d34aafc 100644
> > --- a/bsd-user/arm/target_arch_sigtramp.h
> > +++ b/bsd-user/arm/target_arch_sigtramp.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  arm sysarch() system call emulation
> > + * arm sysarch() system call emulation
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_SIGTRAMP_H
> >  #define TARGET_ARCH_SIGTRAMP_H
> >
> > diff --git a/bsd-user/arm/target_arch_sysarch.h
> b/bsd-user/arm/target_arch_sysarch.h
> > index 5cb7864197..5f7c421e11 100644
> > --- a/bsd-user/arm/target_arch_sysarch.h
> > +++ b/bsd-user/arm/target_arch_sysarch.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  arm sysarch() system call emulation
> > + * arm sysarch() system call emulation
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_SYSARCH_H
> >  #define TARGET_ARCH_SYSARCH_H
> >
> > diff --git a/bsd-user/arm/target_arch_thread.h
> b/bsd-user/arm/target_arch_thread.h
> > index fd257f313d..d22619a845 100644
> > --- a/bsd-user/arm/target_arch_thread.h
> > +++ b/bsd-user/arm/target_arch_thread.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  arm thread support
> > + * arm thread support
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_THREAD_H
> >  #define TARGET_ARCH_THREAD_H
> >
> > diff --git a/bsd-user/arm/target_arch_vmparam.h
> b/bsd-user/arm/target_arch_vmparam.h
> > index 3fb69aff51..c973fcf7d5 100644
> > --- a/bsd-user/arm/target_arch_vmparam.h
> > +++ b/bsd-user/arm/target_arch_vmparam.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  arm VM parameters definitions
> > + * arm VM parameters definitions
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_VMPARAM_H
> >  #define TARGET_ARCH_VMPARAM_H
> >
> > diff --git a/bsd-user/arm/target_syscall.h
> b/bsd-user/arm/target_syscall.h
> > index 5804a53541..deab3baebf 100644
> > --- a/bsd-user/arm/target_syscall.h
> > +++ b/bsd-user/arm/target_syscall.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  arm cpu system call stubs
> > + * arm cpu system call stubs
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef ARM_TARGET_SYSCALL_H
> >  #define ARM_TARGET_SYSCALL_H
> >
> > diff --git a/bsd-user/bsd-file.h b/bsd-user/bsd-file.h
> > index 6fa2c30b4d..dca1518cb1 100644
> > --- a/bsd-user/bsd-file.h
> > +++ b/bsd-user/bsd-file.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  file related system call shims and definitions
> > + * file related system call shims and definitions
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef BSD_FILE_H
> >  #define BSD_FILE_H
> >
> > diff --git a/bsd-user/bsd-mem.c b/bsd-user/bsd-mem.c
> > index 2ab1334b70..8c6c4081f7 100644
> > --- a/bsd-user/bsd-mem.c
> > +++ b/bsd-user/bsd-mem.c
> > @@ -1,20 +1,9 @@
> >  /*
> > - *  memory management system conversion routines
> > + * memory management system conversion routines
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> >  #include "qemu/osdep.h"
> >  #include "qemu.h"
> > diff --git a/bsd-user/bsd-mem.h b/bsd-user/bsd-mem.h
> > index a118e57260..8c0b0b6919 100644
> > --- a/bsd-user/bsd-mem.h
> > +++ b/bsd-user/bsd-mem.h
> > @@ -1,20 +1,9 @@
> >  /*
> > - *  memory management system call shims and definitions
> > + * memory management system call shims and definitions
> >   *
> > - *  Copyright (c) 2013-15 Stacey D. Son
> > + * Copyright (c) 2013-2015 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> >
> >  /*
> > diff --git a/bsd-user/bsd-proc.c b/bsd-user/bsd-proc.c
> > index 8dcac9608d..7fb46046c7 100644
> > --- a/bsd-user/bsd-proc.c
> > +++ b/bsd-user/bsd-proc.c
> > @@ -1,20 +1,9 @@
> >  /*
> > - *  BSD process related system call helpers
> > + * BSD process related system call helpers
> >   *
> > - *  Copyright (c) 2013-14 Stacey D. Son
> > + * Copyright (c) 2013-2014 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> >  #include "qemu/osdep.h"
> >
> > diff --git a/bsd-user/bsd-proc.h b/bsd-user/bsd-proc.h
> > index 8b1c2deea3..b1d4446ff1 100644
> > --- a/bsd-user/bsd-proc.h
> > +++ b/bsd-user/bsd-proc.h
> > @@ -1,20 +1,9 @@
> >  /*
> > - *  process related system call shims and definitions
> > + * process related system call shims and definitions
> >   *
> > - *  Copyright (c) 2013-2014 Stacey D. Son
> > + * Copyright (c) 2013-2014 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> >
> >  #ifndef BSD_PROC_H_
> > diff --git a/bsd-user/bsdload.c b/bsd-user/bsdload.c
> > index 5b3c061a45..b3c9f0265b 100644
> > --- a/bsd-user/bsdload.c
> > +++ b/bsd-user/bsdload.c
> > @@ -1,22 +1,11 @@
> >  /*
> > - *  Load BSD executables.
> > + * Load BSD executables.
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #include "qemu/osdep.h"
> > -
> >  #include "qemu.h"
> >
> >  /* ??? This should really be somewhere else.  */
> > diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c
> > index 3bca0cc9ed..ddac272424 100644
> > --- a/bsd-user/elfload.c
> > +++ b/bsd-user/elfload.c
> > @@ -1,20 +1,9 @@
> >  /*
> > - *  ELF loading code
> > + * ELF loading code
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> >
> >  #include "qemu/osdep.h"
> > diff --git a/bsd-user/freebsd/os-misc.h b/bsd-user/freebsd/os-misc.h
> > index 71145764a4..d9979b2a8b 100644
> > --- a/bsd-user/freebsd/os-misc.h
> > +++ b/bsd-user/freebsd/os-misc.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  miscellaneous FreeBSD system call shims
> > + * miscellaneous FreeBSD system call shims
> >   *
> > - *  Copyright (c) 2013-14 Stacey D. Son
> > + * Copyright (c) 2013-2014 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef OS_MISC_H
> >  #define OS_MISC_H
> >
> > diff --git a/bsd-user/freebsd/os-proc.c b/bsd-user/freebsd/os-proc.c
> > index bf993f1b66..0309036178 100644
> > --- a/bsd-user/freebsd/os-proc.c
> > +++ b/bsd-user/freebsd/os-proc.c
> > @@ -1,20 +1,9 @@
> >  /*
> > - *  FreeBSD process related emulation code
> > + * FreeBSD process related emulation code
> >   *
> > - *  Copyright (c) 2013-15 Stacey D. Son
> > + * Copyright (c) 2013-2014 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> >  #include "qemu/osdep.h"
> >
> > diff --git a/bsd-user/freebsd/os-proc.h b/bsd-user/freebsd/os-proc.h
> > index cc53215138..72ccf23e17 100644
> > --- a/bsd-user/freebsd/os-proc.h
> > +++ b/bsd-user/freebsd/os-proc.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  process related system call shims and definitions
> > + * process related system call shims and definitions
> >   *
> > - *  Copyright (c) 2013-14 Stacey D. Son
> > + * Copyright (c) 2013-2014 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef BSD_USER_FREEBSD_OS_PROC_H
> >  #define BSD_USER_FREEBSD_OS_PROC_H
> >
> > diff --git a/bsd-user/freebsd/os-stat.c b/bsd-user/freebsd/os-stat.c
> > index f0f9e609c3..10870430fe 100644
> > --- a/bsd-user/freebsd/os-stat.c
> > +++ b/bsd-user/freebsd/os-stat.c
> > @@ -1,20 +1,9 @@
> >  /*
> > - *  FreeBSD stat related conversion routines
> > + * FreeBSD stat related conversion routines
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> >  #include "qemu/osdep.h"
> >
> > diff --git a/bsd-user/freebsd/os-stat.h b/bsd-user/freebsd/os-stat.h
> > index 3bdc66aa98..ea95aa6344 100644
> > --- a/bsd-user/freebsd/os-stat.h
> > +++ b/bsd-user/freebsd/os-stat.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  stat related system call shims and definitions
> > + * stat related system call shims and definitions
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef BSD_USER_FREEBSD_OS_STAT_H
> >  #define BSD_USER_FREEBSD_OS_STAT_H
> >
> > diff --git a/bsd-user/freebsd/os-strace.h b/bsd-user/freebsd/os-strace.h
> > index a222f093b5..ad48e99db1 100644
> > --- a/bsd-user/freebsd/os-strace.h
> > +++ b/bsd-user/freebsd/os-strace.h
> > @@ -1,25 +1,12 @@
> >  /*
> > - *  FreeBSD dependent strace print functions
> > + * FreeBSD dependent strace print functions
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #include "target_arch_sysarch.h"    /* architecture dependent functions
> */
> >
> > -
> >  static inline void do_os_print_sysarch(const struct syscallname *name,
> >          abi_long arg1, abi_long arg2, abi_long arg3, abi_long arg4,
> >          abi_long arg5, abi_long arg6)
> > diff --git a/bsd-user/freebsd/target_os_elf.h
> b/bsd-user/freebsd/target_os_elf.h
> > index 01124979f7..c67e5a0f8e 100644
> > --- a/bsd-user/freebsd/target_os_elf.h
> > +++ b/bsd-user/freebsd/target_os_elf.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  freebsd ELF definitions
> > + * FreeBSD ELF definitions
> >   *
> > - *  Copyright (c) 2013-15 Stacey D. Son
> > + * Copyright (c) 2013-2015 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_OS_ELF_H
> >  #define TARGET_OS_ELF_H
> >
> > diff --git a/bsd-user/freebsd/target_os_siginfo.h
> b/bsd-user/freebsd/target_os_siginfo.h
> > index 6c282d8502..e7cf76b9bd 100644
> > --- a/bsd-user/freebsd/target_os_siginfo.h
> > +++ b/bsd-user/freebsd/target_os_siginfo.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  FreeBSD siginfo related definitions
> > + * FreeBSD siginfo related definitions
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_OS_SIGINFO_H
> >  #define TARGET_OS_SIGINFO_H
> >
> > diff --git a/bsd-user/freebsd/target_os_stack.h
> b/bsd-user/freebsd/target_os_stack.h
> > index ac0ef22cd7..262f33d839 100644
> > --- a/bsd-user/freebsd/target_os_stack.h
> > +++ b/bsd-user/freebsd/target_os_stack.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  FreeBSD setup_initial_stack() implementation.
> > + * FreeBSD setup_initial_stack() implementation.
> >   *
> > - *  Copyright (c) 2013-14 Stacey D. Son
> > + * Copyright (c) 2013-2014 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_OS_STACK_H
> >  #define TARGET_OS_STACK_H
> >
> > diff --git a/bsd-user/freebsd/target_os_thread.h
> b/bsd-user/freebsd/target_os_thread.h
> > index 1b32cebd26..ff88679e40 100644
> > --- a/bsd-user/freebsd/target_os_thread.h
> > +++ b/bsd-user/freebsd/target_os_thread.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  FreeBSD thread dependent code and definitions
> > + * FreeBSD thread dependent code and definitions
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_OS_THREAD_H
> >  #define TARGET_OS_THREAD_H
> >
> > diff --git a/bsd-user/freebsd/target_os_user.h
> b/bsd-user/freebsd/target_os_user.h
> > index 1ca7b5ab17..9703b9a61a 100644
> > --- a/bsd-user/freebsd/target_os_user.h
> > +++ b/bsd-user/freebsd/target_os_user.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  sys/user.h definitions
> > + * sys/user.h definitions
> >   *
> > - *  Copyright (c) 2015 Stacey D. Son (sson at FreeBSD)
> > + * Copyright (c) 2015 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_OS_USER_H
> >  #define TARGET_OS_USER_H
> >
> > diff --git a/bsd-user/freebsd/target_os_vmparam.h
> b/bsd-user/freebsd/target_os_vmparam.h
> > index 8457dd3913..9feec5296d 100644
> > --- a/bsd-user/freebsd/target_os_vmparam.h
> > +++ b/bsd-user/freebsd/target_os_vmparam.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  FreeBSD VM parameters definitions
> > + * FreeBSD VM parameters definitions
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_OS_VMPARAM_H
> >  #define TARGET_OS_VMPARAM_H
> >
> > diff --git a/bsd-user/i386/signal.c b/bsd-user/i386/signal.c
> > index a3131047b8..742032090d 100644
> > --- a/bsd-user/i386/signal.c
> > +++ b/bsd-user/i386/signal.c
> > @@ -1,20 +1,9 @@
> >  /*
> > - *  i386 dependent signal definitions
> > + * i386 dependent signal definitions
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> >
> >  #include "qemu/osdep.h"
> > diff --git a/bsd-user/i386/target_arch.h b/bsd-user/i386/target_arch.h
> > index 9595e60f09..74c8e7fb47 100644
> > --- a/bsd-user/i386/target_arch.h
> > +++ b/bsd-user/i386/target_arch.h
> > @@ -1,22 +1,10 @@
> >  /*
> >   * Intel x86 specific prototypes for bsd-user
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_H
> >  #define TARGET_ARCH_H
> >
> > diff --git a/bsd-user/i386/target_arch_cpu.c
> b/bsd-user/i386/target_arch_cpu.c
> > index 2a3af2ddef..fa8ad4b385 100644
> > --- a/bsd-user/i386/target_arch_cpu.c
> > +++ b/bsd-user/i386/target_arch_cpu.c
> > @@ -1,20 +1,9 @@
> >  /*
> > - *  i386 cpu related code
> > + * i386 cpu related code
> >   *
> > - * Copyright (c) 2013 Stacey Son <sson@FreeBSD.org>
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> >
> >  #include "qemu/osdep.h"
> > diff --git a/bsd-user/i386/target_arch_cpu.h
> b/bsd-user/i386/target_arch_cpu.h
> > index f147d5b6f8..c6e8bfd8ca 100644
> > --- a/bsd-user/i386/target_arch_cpu.h
> > +++ b/bsd-user/i386/target_arch_cpu.h
> > @@ -1,21 +1,10 @@
> >  /*
> > - *  i386 cpu init and loop
> > + * i386 cpu init and loop
> >   *
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_CPU_H
> >  #define TARGET_ARCH_CPU_H
> >
> > diff --git a/bsd-user/i386/target_arch_elf.h
> b/bsd-user/i386/target_arch_elf.h
> > index 4ac27b02e7..99cff66a22 100644
> > --- a/bsd-user/i386/target_arch_elf.h
> > +++ b/bsd-user/i386/target_arch_elf.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  i386 ELF definitions
> > + * i386 ELF definitions
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_ELF_H
> >  #define TARGET_ARCH_ELF_H
> >
> > diff --git a/bsd-user/i386/target_arch_reg.h
> b/bsd-user/i386/target_arch_reg.h
> > index 8123109697..cebf2fd5cc 100644
> > --- a/bsd-user/i386/target_arch_reg.h
> > +++ b/bsd-user/i386/target_arch_reg.h
> > @@ -1,23 +1,10 @@
> >  /*
> > - *  FreeBSD i386 register structures
> > + * FreeBSD i386 register structures
> >   *
> > - *  Copyright (c) 2015 Stacey Son
> > - *  All rights reserved.
> > + * Copyright (c) 2015 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_REG_H
> >  #define TARGET_ARCH_REG_H
> >
> > diff --git a/bsd-user/i386/target_arch_signal.h
> b/bsd-user/i386/target_arch_signal.h
> > index 2c14153ab6..070ba4357a 100644
> > --- a/bsd-user/i386/target_arch_signal.h
> > +++ b/bsd-user/i386/target_arch_signal.h
> > @@ -1,19 +1,9 @@
> >  /*
> > - *  i386 dependent signal definitions
> > + * i386 dependent signal definitions
> >   *
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> >  #ifndef TARGET_ARCH_SIGNAL_H
> >  #define TARGET_ARCH_SIGNAL_H
> > diff --git a/bsd-user/i386/target_arch_sigtramp.h
> b/bsd-user/i386/target_arch_sigtramp.h
> > index ef94cc864f..ace243b6f5 100644
> > --- a/bsd-user/i386/target_arch_sigtramp.h
> > +++ b/bsd-user/i386/target_arch_sigtramp.h
> > @@ -1,22 +1,10 @@
> >  /*
> >   * Intel i386  sigcode for bsd-user
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_SIGTRAMP_H
> >  #define TARGET_ARCH_SIGTRAMP_H
> >
> > diff --git a/bsd-user/i386/target_arch_sysarch.h
> b/bsd-user/i386/target_arch_sysarch.h
> > index db8fee6380..7b128dfab1 100644
> > --- a/bsd-user/i386/target_arch_sysarch.h
> > +++ b/bsd-user/i386/target_arch_sysarch.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  i386 sysarch system call emulation
> > + * i386 sysarch system call emulation
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_SYSARCH_H
> >  #define TARGET_ARCH_SYSARCH_H
> >
> > diff --git a/bsd-user/i386/target_arch_thread.h
> b/bsd-user/i386/target_arch_thread.h
> > index cee2148d94..8ef4f6b648 100644
> > --- a/bsd-user/i386/target_arch_thread.h
> > +++ b/bsd-user/i386/target_arch_thread.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  i386 thread support
> > + * i386 thread support
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_THREAD_H
> >  #define TARGET_ARCH_THREAD_H
> >
> > diff --git a/bsd-user/i386/target_arch_vmparam.h
> b/bsd-user/i386/target_arch_vmparam.h
> > index 79db420e59..cdf6ab0a49 100644
> > --- a/bsd-user/i386/target_arch_vmparam.h
> > +++ b/bsd-user/i386/target_arch_vmparam.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  i386 VM parameters definitions
> > + * i386 VM parameters definitions
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_VMPARAM_H
> >  #define TARGET_ARCH_VMPARAM_H
> >
> > diff --git a/bsd-user/i386/target_syscall.h
> b/bsd-user/i386/target_syscall.h
> > index 940c687a52..a52851f635 100644
> > --- a/bsd-user/i386/target_syscall.h
> > +++ b/bsd-user/i386/target_syscall.h
> > @@ -1,19 +1,9 @@
> >  /*
> > - *  i386 system call definitions
> > + * i386 system call definitions
> >   *
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> >  #ifndef TARGET_SYSCALL_H
> >  #define TARGET_SYSCALL_H
> > diff --git a/bsd-user/main.c b/bsd-user/main.c
> > index 73aae8c327..84351e1631 100644
> > --- a/bsd-user/main.c
> > +++ b/bsd-user/main.c
> > @@ -1,23 +1,11 @@
> >  /*
> > - *  qemu bsd user main
> > + * qemu bsd user main
> >   *
> > - *  Copyright (c) 2003-2008 Fabrice Bellard
> > - *  Copyright (c) 2013-14 Stacey Son
> > + * Copyright (c) 2003-2008 Fabrice Bellard
> > + * Copyright (c) 2013-14 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #include "qemu/osdep.h"
> >  #include <sys/resource.h>
> >  #include <sys/sysctl.h>
> > diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
> > index 24ba1728eb..fb685e84aa 100644
> > --- a/bsd-user/mmap.c
> > +++ b/bsd-user/mmap.c
> > @@ -1,20 +1,9 @@
> >  /*
> > - *  mmap support for qemu
> > + * mmap support for qemu
> >   *
> > - *  Copyright (c) 2003 - 2008 Fabrice Bellard
> > + * Copyright (c) 2003 - 2008 Fabrice Bellard
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> >  #include "qemu/osdep.h"
> >  #include "exec/mmap-lock.h"
> > diff --git a/bsd-user/qemu-bsd.h b/bsd-user/qemu-bsd.h
> > index 56affcd31d..64d4fbe3a9 100644
> > --- a/bsd-user/qemu-bsd.h
> > +++ b/bsd-user/qemu-bsd.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  BSD conversion extern declarations
> > + * BSD conversion extern declarations
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef QEMU_BSD_H
> >  #define QEMU_BSD_H
> >
> > diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
> > index 93388e7c34..c4ff1fb0eb 100644
> > --- a/bsd-user/qemu.h
> > +++ b/bsd-user/qemu.h
> > @@ -1,18 +1,9 @@
> >  /*
> > - *  qemu bsd user mode definition
> > + * qemu bsd user mode definition
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> >  #ifndef QEMU_H
> >  #define QEMU_H
> > diff --git a/bsd-user/signal.c b/bsd-user/signal.c
> > index dadcc037dc..832ffef7c5 100644
> > --- a/bsd-user/signal.c
> > +++ b/bsd-user/signal.c
> > @@ -1,21 +1,10 @@
> >  /*
> > - *  Emulation of BSD signals
> > + * Emulation of BSD signals
> >   *
> > - *  Copyright (c) 2003 - 2008 Fabrice Bellard
> > - *  Copyright (c) 2013 Stacey Son
> > + * Copyright (c) 2003 - 2008 Fabrice Bellard
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> >
> >  #include "qemu/osdep.h"
> > diff --git a/bsd-user/strace.c b/bsd-user/strace.c
> > index 6dc01d3be7..a015bfddba 100644
> > --- a/bsd-user/strace.c
> > +++ b/bsd-user/strace.c
> > @@ -1,19 +1,9 @@
> >  /*
> > - *  System call tracing and debugging
> > + * System call tracing and debugging
> >   *
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> >
> >  #include "qemu/osdep.h"
> > diff --git a/bsd-user/syscall_defs.h b/bsd-user/syscall_defs.h
> > index cc4b484f3a..a2ded2fac1 100644
> > --- a/bsd-user/syscall_defs.h
> > +++ b/bsd-user/syscall_defs.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  System call related declarations
> > + * System call related declarations
> >   *
> > - *  Copyright (c) 2013-15 Stacey D. Son (sson at FreeBSD)
> > + * Copyright (c) 2013-2015 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef SYSCALL_DEFS_H
> >  #define SYSCALL_DEFS_H
> >
> > diff --git a/bsd-user/x86_64/signal.c b/bsd-user/x86_64/signal.c
> > index 46cb865180..823d7217ad 100644
> > --- a/bsd-user/x86_64/signal.c
> > +++ b/bsd-user/x86_64/signal.c
> > @@ -1,19 +1,9 @@
> >  /*
> > - *  x86_64 signal definitions
> > + * x86_64 signal definitions
> >   *
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> >
> >  #include "qemu/osdep.h"
> > diff --git a/bsd-user/x86_64/target_arch.h
> b/bsd-user/x86_64/target_arch.h
> > index 09bd974889..177e6b442a 100644
> > --- a/bsd-user/x86_64/target_arch.h
> > +++ b/bsd-user/x86_64/target_arch.h
> > @@ -1,22 +1,10 @@
> >  /*
> >   * Intel x86_64 specific prototypes for bsd-user
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_H
> >  #define TARGET_ARCH_H
> >
> > diff --git a/bsd-user/x86_64/target_arch_cpu.c
> b/bsd-user/x86_64/target_arch_cpu.c
> > index 1d32f18907..aeeb1235c9 100644
> > --- a/bsd-user/x86_64/target_arch_cpu.c
> > +++ b/bsd-user/x86_64/target_arch_cpu.c
> > @@ -1,20 +1,9 @@
> >  /*
> > - *  x86_64 cpu related code
> > + * x86_64 cpu related code
> >   *
> > - * Copyright (c) 2013 Stacey Son <sson@FreeBSD.org>
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> >
> >  #include "qemu/osdep.h"
> > diff --git a/bsd-user/x86_64/target_arch_cpu.h
> b/bsd-user/x86_64/target_arch_cpu.h
> > index 1fa71d87f1..f12a8ab49e 100644
> > --- a/bsd-user/x86_64/target_arch_cpu.h
> > +++ b/bsd-user/x86_64/target_arch_cpu.h
> > @@ -1,21 +1,10 @@
> >  /*
> > - *  x86_64 cpu init and loop
> > + * x86_64 cpu init and loop
> >   *
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_CPU_H
> >  #define TARGET_ARCH_CPU_H
> >
> > diff --git a/bsd-user/x86_64/target_arch_elf.h
> b/bsd-user/x86_64/target_arch_elf.h
> > index e51c2faf08..020533904e 100644
> > --- a/bsd-user/x86_64/target_arch_elf.h
> > +++ b/bsd-user/x86_64/target_arch_elf.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  x86_64 ELF definitions
> > + * x86_64 ELF definitions
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2015 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_ELF_H
> >  #define TARGET_ARCH_ELF_H
> >
> > diff --git a/bsd-user/x86_64/target_arch_reg.h
> b/bsd-user/x86_64/target_arch_reg.h
> > index 7a766de918..c0c766ac1a 100644
> > --- a/bsd-user/x86_64/target_arch_reg.h
> > +++ b/bsd-user/x86_64/target_arch_reg.h
> > @@ -1,23 +1,10 @@
> >  /*
> > - *  FreeBSD amd64 register structures
> > + * FreeBSD amd64 register structures
> >   *
> > - *  Copyright (c) 2015 Stacey Son
> > - *  All rights reserved.
> > + * Copyright (c) 2015 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_REG_H
> >  #define TARGET_ARCH_REG_H
> >
> > diff --git a/bsd-user/x86_64/target_arch_signal.h
> b/bsd-user/x86_64/target_arch_signal.h
> > index f833ee66ce..2b63048f8b 100644
> > --- a/bsd-user/x86_64/target_arch_signal.h
> > +++ b/bsd-user/x86_64/target_arch_signal.h
> > @@ -1,21 +1,10 @@
> >  /*
> > - *  x86_64 signal definitions
> > + * x86_64 signal definitions
> >   *
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_SIGNAL_H
> >  #define TARGET_ARCH_SIGNAL_H
> >
> > diff --git a/bsd-user/x86_64/target_arch_sigtramp.h
> b/bsd-user/x86_64/target_arch_sigtramp.h
> > index 01da614098..cab22fb7e8 100644
> > --- a/bsd-user/x86_64/target_arch_sigtramp.h
> > +++ b/bsd-user/x86_64/target_arch_sigtramp.h
> > @@ -1,29 +1,16 @@
> >  /*
> >   * Intel x86_64  sigcode for bsd-user
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_SIGTRAMP_H
> >  #define TARGET_ARCH_SIGTRAMP_H
> >
> >  static inline abi_long setup_sigtramp(abi_ulong offset, unsigned
> sigf_uc,
> >          unsigned sys_sigreturn)
> >  {
> > -
> >      return 0;
> >  }
> >  #endif /* TARGET_ARCH_SIGTRAMP_H */
> > diff --git a/bsd-user/x86_64/target_arch_sysarch.h
> b/bsd-user/x86_64/target_arch_sysarch.h
> > index 152cb8bcb8..3a6f74161f 100644
> > --- a/bsd-user/x86_64/target_arch_sysarch.h
> > +++ b/bsd-user/x86_64/target_arch_sysarch.h
> > @@ -1,21 +1,10 @@
> >  /*
> > - *  x86_64 sysarch() syscall emulation
> > + * x86_64 sysarch() syscall emulation
> >   *
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_SYSARCH_H
> >  #define TARGET_ARCH_SYSARCH_H
> >
> > diff --git a/bsd-user/x86_64/target_arch_thread.h
> b/bsd-user/x86_64/target_arch_thread.h
> > index 7739bb2154..176c347037 100644
> > --- a/bsd-user/x86_64/target_arch_thread.h
> > +++ b/bsd-user/x86_64/target_arch_thread.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  x86_64 thread support
> > + * x86_64 thread support
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_THREAD_H
> >  #define TARGET_ARCH_THREAD_H
> >
> > diff --git a/bsd-user/x86_64/target_arch_vmparam.h
> b/bsd-user/x86_64/target_arch_vmparam.h
> > index 6797623a6b..8919c5e6e5 100644
> > --- a/bsd-user/x86_64/target_arch_vmparam.h
> > +++ b/bsd-user/x86_64/target_arch_vmparam.h
> > @@ -1,22 +1,10 @@
> >  /*
> > - *  Intel x86_64 VM parameters definitions
> > + * Intel x86_64 VM parameters definitions
> >   *
> > - *  Copyright (c) 2013 Stacey D. Son
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> > -
> >  #ifndef TARGET_ARCH_VMPARAM_H
> >  #define TARGET_ARCH_VMPARAM_H
> >
> > diff --git a/bsd-user/x86_64/target_syscall.h
> b/bsd-user/x86_64/target_syscall.h
> > index a8e6274b76..5adced9bde 100644
> > --- a/bsd-user/x86_64/target_syscall.h
> > +++ b/bsd-user/x86_64/target_syscall.h
> > @@ -1,19 +1,9 @@
> >  /*
> > - *  x86_64 system call definitions
> > + * x86_64 system call definitions
> >   *
> > + * Copyright (c) 2013 Stacey D. Son
> >   *
> > - *  This program is free software; you can redistribute it and/or modify
> > - *  it under the terms of the GNU General Public License as published by
> > - *  the Free Software Foundation; either version 2 of the License, or
> > - *  (at your option) any later version.
> > - *
> > - *  This program is distributed in the hope that it will be useful,
> > - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> > - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > - *  GNU General Public License for more details.
> > - *
> > - *  You should have received a copy of the GNU General Public License
> > - *  along with this program; if not, see <http://www.gnu.org/licenses/
> >.
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> >   */
> >  #ifndef TARGET_SYSCALL_H
> >  #define TARGET_SYSCALL_H
> >
> > ---
> > base-commit: ffcf1a7981793973ffbd8100a7c3c6042d02ae23
> > change-id: 20260302-bsd-user-copyright-3a46d2307150
> >
> > Best regards,
> > --
> > Warner Losh <imp@bsdimp.com>
> >
> >
>
> 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 :|
>
>
Re: [PATCH] bsd-user: Switch to SPDX-License-Expression
Posted by Daniel P. Berrangé 1 month, 1 week ago 
On Tue, Mar 03, 2026 at 05:17:15AM -0700, Warner Losh wrote:
> On Tue, Mar 3, 2026 at 1:51 AM Daniel P. Berrangé <berrange@redhat.com>
> wrote:
> 
> > On Mon, Mar 02, 2026 at 09:46:06PM -0700, Warner Losh wrote:
> > > Switch all the files over to using SPDX. This also corrects various
> > > small errors in the form of the copyright messages. It adds copyright to
> > > those files that lack it. There's no functional change.
> > >
> > > Signed-off-by: Stacey Son <sson@FreeBSD.org>
> > > Signed-off-by: Warner Losh <imp@bsdimp.com>
> > > ---
> > > Since I'll be upstreaming more files from bsd-user, and since qemu now
> > > requires SPDX and prohibits boilerplate, this will make it easier. I've
> > > converted all the relevant bits in bsd-user upstream.
> >
> > Note, QEMU / checkpatch.pl only requires SDPX on *newly* authored files.
> > Existing code files, or new files whose content is copied from an
> > existing file (either inside or outside QEMU git) are exempt from this
> > and in fact required to be left without SPDX.
> >
> > The reasoning is that there is some uncertainty about the legality of
> > removing license header text from existing files due to the GPL clause
> > 1 which says
> >
> >   "keep intact all the notices that refer to this License and
> >    to the absence of any warranty;"
> >
> > I interpret that to mean we can not remove license header text from
> > files unless the person doing the removal is the exclusive copyright
> > holder, or has got recorded permission from all copyright holders
> > that apply to each file changed.
> >
> > It is confusing for people because Linux removed all their GPL header
> > text in favour of SPDX, but never provided any clear explanation of
> > why they considered that to be acceptable from the GPL compliance POV.
> >
> 
> So I have Stacey's permission to do this, and he's the only actual copyright
> holder on these files. If I messed up on any, specifically, please let me
> know.
> That's why I included his signed-off-by: he signed off on it and that he's
> legally able to make the change.

None of that was explained in the commit message, hence why I'm
raising this as review feedback.

As a sanity check I did the following to list number of contributors
besides yourself & Stacey:

$ for f in $(awk '{print $1}' <  filelist.txt) ; do echo -n "$f: " ; git log $f | grep ^Author |grep -v Stacey | grep -v Warner | sort | uniq | wc -l ; done
bsd-user/aarch64/signal.c: 0
bsd-user/aarch64/target_arch.h: 0
bsd-user/aarch64/target_arch_cpu.c: 0
bsd-user/aarch64/target_arch_cpu.h: 2
bsd-user/aarch64/target_arch_elf.h: 1
bsd-user/aarch64/target_arch_reg.h: 0
bsd-user/aarch64/target_arch_signal.h: 0
bsd-user/aarch64/target_arch_sigtramp.h: 0
bsd-user/aarch64/target_arch_sysarch.h: 0
bsd-user/aarch64/target_arch_thread.h: 0
bsd-user/aarch64/target_arch_vmparam.h: 0
bsd-user/aarch64/target_syscall.h: 0
bsd-user/arm/signal.c: 1
bsd-user/arm/target_arch.h: 2
bsd-user/arm/target_arch_cpu.c: 1
bsd-user/arm/target_arch_cpu.h: 3
bsd-user/arm/target_arch_elf.h: 3
bsd-user/arm/target_arch_reg.h: 1
bsd-user/arm/target_arch_signal.h: 1
bsd-user/arm/target_arch_sigtramp.h: 1
bsd-user/arm/target_arch_sysarch.h: 1
bsd-user/arm/target_arch_thread.h: 1
bsd-user/arm/target_arch_vmparam.h: 1
bsd-user/arm/target_syscall.h: 1
bsd-user/bsd-file.h: 3
bsd-user/bsd-mem.c: 1
bsd-user/bsd-mem.h: 5
bsd-user/bsd-proc.c: 2
bsd-user/bsd-proc.h: 4
bsd-user/bsdload.c: 5
bsd-user/elfload.c: 21
bsd-user/freebsd/os-misc.h: 2
bsd-user/freebsd/os-proc.c: 3
bsd-user/freebsd/os-proc.h: 3
bsd-user/freebsd/os-stat.c: 1
bsd-user/freebsd/os-stat.h: 3
bsd-user/freebsd/os-strace.h: 0
bsd-user/freebsd/target_os_elf.h: 2
bsd-user/freebsd/target_os_siginfo.h: 2
bsd-user/freebsd/target_os_stack.h: 3
bsd-user/freebsd/target_os_thread.h: 1
bsd-user/freebsd/target_os_user.h: 2
bsd-user/freebsd/target_os_vmparam.h: 1
bsd-user/i386/signal.c: 1
bsd-user/i386/target_arch.h: 1
bsd-user/i386/target_arch_cpu.c: 2
bsd-user/i386/target_arch_cpu.h: 3
bsd-user/i386/target_arch_elf.h: 2
bsd-user/i386/target_arch_reg.h: 1
bsd-user/i386/target_arch_signal.h: 0
bsd-user/i386/target_arch_sigtramp.h: 1
bsd-user/i386/target_arch_sysarch.h: 1
bsd-user/i386/target_arch_thread.h: 1
bsd-user/i386/target_arch_vmparam.h: 1
bsd-user/i386/target_syscall.h: 2
bsd-user/main.c: 47
bsd-user/mmap.c: 14
bsd-user/qemu-bsd.h: 1
bsd-user/qemu.h: 24
bsd-user/signal.c: 14
bsd-user/strace.c: 6
bsd-user/syscall_defs.h: 8
bsd-user/x86_64/signal.c: 1
bsd-user/x86_64/target_arch.h: 1
bsd-user/x86_64/target_arch_cpu.c: 2
bsd-user/x86_64/target_arch_cpu.h: 3
bsd-user/x86_64/target_arch_elf.h: 2
bsd-user/x86_64/target_arch_reg.h: 1
bsd-user/x86_64/target_arch_signal.h: 1
bsd-user/x86_64/target_arch_sigtramp.h: 1
bsd-user/x86_64/target_arch_sysarch.h: 1
bsd-user/x86_64/target_arch_thread.h: 2
bsd-user/x86_64/target_arch_vmparam.h: 1
bsd-user/x86_64/target_syscall.h: 3


I checked a few of the cases where only 1/2/3 other authors are
listed, the changes they made appear to be trivial and could be
considered non-copyrightable. So converting most of the files
is probably OK with just yourself & Stacey's agreement.

The big notable exceptions appear to be many of the files directly
in the bsd-user/ directory, as opposed to sub-dirs, which still
contain code dating back to the original impl of bsd-user.

> Also, I did this to reduce friction in upstreaming bsd-user which has been
> going on for 6ish years now. The SPDX rule is one more thing that slows
> that down. Rather than get an exception to the rule, I brought everything
> into compliance so it isn't yet another issue that takes more time because
> I forgot to do it for a specific patch series. The more issues I have to
> have
> on my checklist, the more the works are gummed up and the slower the
> progress is. We still have somethign like ~30k lines to go last I checked.

> 
> Also, these files have also been out of tree for over a decade. The new
> rule forces me to do what you're complaining about the Linux tree doing:
> remove GPL markings to get it into your tree. Well which is it?  Either it's
> wrong and I shouldn't have to do it for the old files.  Or what I've done
> is proper since it's uniform. Your tree is just an arbitrary repo of these
> files, and isn't special in any meaningful way. So I'm in a no-win situation
> here by your argument.

The checkpatch.pl script warnings indicate that SDPX is only required
on newly added files, and also states that this does not apply if
copying from existing code.  If you've suggestions on how we can improve
the contributor docs or checkpatch script messages to better explain this
please feel free to say

> Also, when I talk about a burdensome and cumbersome upstreaming process,
> this is yet another example. An arbitrary rule that causes friction, but
> provides
> no actual benefit. It's like the style rules: I have to arbitrarily
> reformat code that
> is like that in linux-user because this is "new code". So I spend a fair
> amount of
> time fetching different stones to obey the rules, but since now the code is
> different
> it becomes harder to track linux-user or to ever converge them. Change for
> the
> sake of compliance with an arbitrary rule that doesn't apply elsewhere (for
> whatever
> reason) is one of the death by a thousand cuts I, and others doing this
> work, have
> been suffering for far too long. It's in large measure why things aren't
> further along:
> it steals what little time I have for this and it demotivates further work
> for a while.

There's always a tradeoff in these areas between having project standards
and the burden that places on contributors to comply with the standards.
It can't really be a total free-for-all in a project of the scale that
QEMU is. In addition, caution around license compliance is a key factor
for QEMU, as a critical infrastructure component underpinning a huge
ecosystem of projects and activities.

I agree that the style formatting rules in particular are quite painful
because we never fix historic code to comply with the stated style. Most
other projects would enforce code style unconditionally across the code
base. I would very much like that situation to change.

> So, having said that, is there any specific objection to anything I've
> done? Given
> Stacey's explicit blessing of this change (you'll recall from the patch
> series I just did
> I waited until I had contacted him before I changing it there), did I mess
> up anywhere?

Two simple changes from my pov:

 * Remove the changes to the files that have copyrightable code from
   people besides yourself & Stacey. This looks to be mostly the older
   files in the root bsd-user/ directory

 * Mention in the commit message that this change is being made only
   to files where yourself & Stacey are the copyright holders.


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 :|
Re: [PATCH] bsd-user: Switch to SPDX-License-Expression
Posted by Warner Losh 1 month, 1 week ago 
OK. I'm top posting on purpose.

This request expands what I'm trying to do too much, in ways I think are
unfair. The original authors didn't ask for a copyright line and we're
hopelessly inconsistent about it in the tree. I'm not fixing that problem
here. I'm sorry, but that's potentially a huge ask. I went through them all
and found a couple with no author at all (a much bigger problem, but not my
problem today) and a couple where Fabreise was included. I'll drop those
for simplicity.

The deeper analysis turns a 10-minute project into an hours-long, detailed
analysis. I don't have time for it, and the analysis likely won't produce
better results because the rest of the tree has similar problems regardless
of how we mark the source. And it seems to stand on too fine a point since
the Linux kernel already set a much stronger precedent than I'm doing here.
What I'm doing here is legally defensible and the hours-long analysis won't
produce anything more defensible. The suggested analysis is, at best,
incomplete since (a) authorship in this part of the tree is sloppy at times
and (b) it doesn't consider the out-of-tree history, which sometimes
produces different results with `git blame`. It's turtles all the way down
here. And I've also gotten mixed messages in the past when I tried to
attribute authorship for code I copied from linux-user in the past, so I
lack a good set of criteria to do the analysis.

I tried to highlight that these were old files in the [PATCH v4 00/24]
bsd-user: Upstream misc system calls (System V IPC, reboot, etc) series,
but I was still requested to add the SPDX headers instead since they were
truly "new files." So I'm doing them all to avoid that in the future. Since
I don't want arguments and when I push back I get inconsistent results for
simimlar situations.

I'm trying to not let my irritation show through too much, but I'm only 10k
lines into 40k of upstreaming and these side trips are slowing things down
too much. I appreciate the reviews that have found bugs in the code, but
I'm struggling with requests like this. I really need to limit the scope of
what I take on because there's a lot left to do and I'm doing it in my
spare time.

So does that sound like a good plan? Or what should I do?

Warner

P.S. Sorry if my frustration is showing through too much...

On Tue, Mar 3, 2026 at 5:52 AM Daniel P. Berrangé <berrange@redhat.com>
wrote:

> On Tue, Mar 03, 2026 at 05:17:15AM -0700, Warner Losh wrote:
> > On Tue, Mar 3, 2026 at 1:51 AM Daniel P. Berrangé <berrange@redhat.com>
> > wrote:
> >
> > > On Mon, Mar 02, 2026 at 09:46:06PM -0700, Warner Losh wrote:
> > > > Switch all the files over to using SPDX. This also corrects various
> > > > small errors in the form of the copyright messages. It adds
> copyright to
> > > > those files that lack it. There's no functional change.
> > > >
> > > > Signed-off-by: Stacey Son <sson@FreeBSD.org>
> > > > Signed-off-by: Warner Losh <imp@bsdimp.com>
> > > > ---
> > > > Since I'll be upstreaming more files from bsd-user, and since qemu
> now
> > > > requires SPDX and prohibits boilerplate, this will make it easier.
> I've
> > > > converted all the relevant bits in bsd-user upstream.
> > >
> > > Note, QEMU / checkpatch.pl only requires SDPX on *newly* authored
> files.
> > > Existing code files, or new files whose content is copied from an
> > > existing file (either inside or outside QEMU git) are exempt from this
> > > and in fact required to be left without SPDX.
> > >
> > > The reasoning is that there is some uncertainty about the legality of
> > > removing license header text from existing files due to the GPL clause
> > > 1 which says
> > >
> > >   "keep intact all the notices that refer to this License and
> > >    to the absence of any warranty;"
> > >
> > > I interpret that to mean we can not remove license header text from
> > > files unless the person doing the removal is the exclusive copyright
> > > holder, or has got recorded permission from all copyright holders
> > > that apply to each file changed.
> > >
> > > It is confusing for people because Linux removed all their GPL header
> > > text in favour of SPDX, but never provided any clear explanation of
> > > why they considered that to be acceptable from the GPL compliance POV.
> > >
> >
> > So I have Stacey's permission to do this, and he's the only actual
> copyright
> > holder on these files. If I messed up on any, specifically, please let me
> > know.
> > That's why I included his signed-off-by: he signed off on it and that
> he's
> > legally able to make the change.
>
> None of that was explained in the commit message, hence why I'm
> raising this as review feedback.
>
> As a sanity check I did the following to list number of contributors
> besides yourself & Stacey:
>
> $ for f in $(awk '{print $1}' <  filelist.txt) ; do echo -n "$f: " ; git
> log $f | grep ^Author |grep -v Stacey | grep -v Warner | sort | uniq | wc
> -l ; done
> bsd-user/aarch64/signal.c: 0
> bsd-user/aarch64/target_arch.h: 0
> bsd-user/aarch64/target_arch_cpu.c: 0
> bsd-user/aarch64/target_arch_cpu.h: 2
> bsd-user/aarch64/target_arch_elf.h: 1
> bsd-user/aarch64/target_arch_reg.h: 0
> bsd-user/aarch64/target_arch_signal.h: 0
> bsd-user/aarch64/target_arch_sigtramp.h: 0
> bsd-user/aarch64/target_arch_sysarch.h: 0
> bsd-user/aarch64/target_arch_thread.h: 0
> bsd-user/aarch64/target_arch_vmparam.h: 0
> bsd-user/aarch64/target_syscall.h: 0
> bsd-user/arm/signal.c: 1
> bsd-user/arm/target_arch.h: 2
> bsd-user/arm/target_arch_cpu.c: 1
> bsd-user/arm/target_arch_cpu.h: 3
> bsd-user/arm/target_arch_elf.h: 3
> bsd-user/arm/target_arch_reg.h: 1
> bsd-user/arm/target_arch_signal.h: 1
> bsd-user/arm/target_arch_sigtramp.h: 1
> bsd-user/arm/target_arch_sysarch.h: 1
> bsd-user/arm/target_arch_thread.h: 1
> bsd-user/arm/target_arch_vmparam.h: 1
> bsd-user/arm/target_syscall.h: 1
> bsd-user/bsd-file.h: 3
> bsd-user/bsd-mem.c: 1
> bsd-user/bsd-mem.h: 5
> bsd-user/bsd-proc.c: 2
> bsd-user/bsd-proc.h: 4
> bsd-user/bsdload.c: 5
> bsd-user/elfload.c: 21
> bsd-user/freebsd/os-misc.h: 2
> bsd-user/freebsd/os-proc.c: 3
> bsd-user/freebsd/os-proc.h: 3
> bsd-user/freebsd/os-stat.c: 1
> bsd-user/freebsd/os-stat.h: 3
> bsd-user/freebsd/os-strace.h: 0
> bsd-user/freebsd/target_os_elf.h: 2
> bsd-user/freebsd/target_os_siginfo.h: 2
> bsd-user/freebsd/target_os_stack.h: 3
> bsd-user/freebsd/target_os_thread.h: 1
> bsd-user/freebsd/target_os_user.h: 2
> bsd-user/freebsd/target_os_vmparam.h: 1
> bsd-user/i386/signal.c: 1
> bsd-user/i386/target_arch.h: 1
> bsd-user/i386/target_arch_cpu.c: 2
> bsd-user/i386/target_arch_cpu.h: 3
> bsd-user/i386/target_arch_elf.h: 2
> bsd-user/i386/target_arch_reg.h: 1
> bsd-user/i386/target_arch_signal.h: 0
> bsd-user/i386/target_arch_sigtramp.h: 1
> bsd-user/i386/target_arch_sysarch.h: 1
> bsd-user/i386/target_arch_thread.h: 1
> bsd-user/i386/target_arch_vmparam.h: 1
> bsd-user/i386/target_syscall.h: 2
> bsd-user/main.c: 47
> bsd-user/mmap.c: 14
> bsd-user/qemu-bsd.h: 1
> bsd-user/qemu.h: 24
> bsd-user/signal.c: 14
> bsd-user/strace.c: 6
> bsd-user/syscall_defs.h: 8
> bsd-user/x86_64/signal.c: 1
> bsd-user/x86_64/target_arch.h: 1
> bsd-user/x86_64/target_arch_cpu.c: 2
> bsd-user/x86_64/target_arch_cpu.h: 3
> bsd-user/x86_64/target_arch_elf.h: 2
> bsd-user/x86_64/target_arch_reg.h: 1
> bsd-user/x86_64/target_arch_signal.h: 1
> bsd-user/x86_64/target_arch_sigtramp.h: 1
> bsd-user/x86_64/target_arch_sysarch.h: 1
> bsd-user/x86_64/target_arch_thread.h: 2
> bsd-user/x86_64/target_arch_vmparam.h: 1
> bsd-user/x86_64/target_syscall.h: 3
>
>
> I checked a few of the cases where only 1/2/3 other authors are
> listed, the changes they made appear to be trivial and could be
> considered non-copyrightable. So converting most of the files
> is probably OK with just yourself & Stacey's agreement.
>
> The big notable exceptions appear to be many of the files directly
> in the bsd-user/ directory, as opposed to sub-dirs, which still
> contain code dating back to the original impl of bsd-user.
>
> > Also, I did this to reduce friction in upstreaming bsd-user which has
> been
> > going on for 6ish years now. The SPDX rule is one more thing that slows
> > that down. Rather than get an exception to the rule, I brought everything
> > into compliance so it isn't yet another issue that takes more time
> because
> > I forgot to do it for a specific patch series. The more issues I have to
> > have
> > on my checklist, the more the works are gummed up and the slower the
> > progress is. We still have somethign like ~30k lines to go last I
> checked.
>
> >
> > Also, these files have also been out of tree for over a decade. The new
> > rule forces me to do what you're complaining about the Linux tree doing:
> > remove GPL markings to get it into your tree. Well which is it?  Either
> it's
> > wrong and I shouldn't have to do it for the old files.  Or what I've done
> > is proper since it's uniform. Your tree is just an arbitrary repo of
> these
> > files, and isn't special in any meaningful way. So I'm in a no-win
> situation
> > here by your argument.
>
> The checkpatch.pl script warnings indicate that SDPX is only required
> on newly added files, and also states that this does not apply if
> copying from existing code.  If you've suggestions on how we can improve
> the contributor docs or checkpatch script messages to better explain this
> please feel free to say
>
> > Also, when I talk about a burdensome and cumbersome upstreaming process,
> > this is yet another example. An arbitrary rule that causes friction, but
> > provides
> > no actual benefit. It's like the style rules: I have to arbitrarily
> > reformat code that
> > is like that in linux-user because this is "new code". So I spend a fair
> > amount of
> > time fetching different stones to obey the rules, but since now the code
> is
> > different
> > it becomes harder to track linux-user or to ever converge them. Change
> for
> > the
> > sake of compliance with an arbitrary rule that doesn't apply elsewhere
> (for
> > whatever
> > reason) is one of the death by a thousand cuts I, and others doing this
> > work, have
> > been suffering for far too long. It's in large measure why things aren't
> > further along:
> > it steals what little time I have for this and it demotivates further
> work
> > for a while.
>
> There's always a tradeoff in these areas between having project standards
> and the burden that places on contributors to comply with the standards.
> It can't really be a total free-for-all in a project of the scale that
> QEMU is. In addition, caution around license compliance is a key factor
> for QEMU, as a critical infrastructure component underpinning a huge
> ecosystem of projects and activities.
>
> I agree that the style formatting rules in particular are quite painful
> because we never fix historic code to comply with the stated style. Most
> other projects would enforce code style unconditionally across the code
> base. I would very much like that situation to change.
>
> > So, having said that, is there any specific objection to anything I've
> > done? Given
> > Stacey's explicit blessing of this change (you'll recall from the patch
> > series I just did
> > I waited until I had contacted him before I changing it there), did I
> mess
> > up anywhere?
>
> Two simple changes from my pov:
>
>  * Remove the changes to the files that have copyrightable code from
>    people besides yourself & Stacey. This looks to be mostly the older
>    files in the root bsd-user/ directory
>
>  * Mention in the commit message that this change is being made only
>    to files where yourself & Stacey are the copyright holders.
>
>
> 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 :|
>
>
Re: [PATCH] bsd-user: Switch to SPDX-License-Expression
Posted by Markus Armbruster 1 month, 1 week ago 
Warner Losh <imp@bsdimp.com> writes:

[...]

> I'm trying to not let my irritation show through too much, but I'm only 10k
> lines into 40k of upstreaming and these side trips are slowing things down
> too much. I appreciate the reviews that have found bugs in the code, but
> I'm struggling with requests like this. I really need to limit the scope of
> what I take on because there's a lot left to do and I'm doing it in my
> spare time.
> 
> So does that sound like a good plan? Or what should I do?
> 
> Warner
> 
> P.S. Sorry if my frustration is showing through too much...

I don't see a reason for apologies here.

Cooperation gets frustrating at times.  We may hide our frustration,
stew in it until it becomes unbearable, then explode, or give up and go
away.  All undesirable outcomes.  It's better to be open about it early,
in a respectful manner.  This is what you did, and it's alright.

It's okay to say "no, because" to reviewer requests.  We can then try to
work out a path forward together.
Re: [PATCH] bsd-user: Switch to SPDX-License-Expression
Posted by Warner Losh 1 month, 1 week ago 
On Wed, Mar 4, 2026 at 11:20 PM Markus Armbruster <armbru@redhat.com> wrote:

> Warner Losh <imp@bsdimp.com> writes:
>
> [...]
>
> > I'm trying to not let my irritation show through too much, but I'm only
> 10k
> > lines into 40k of upstreaming and these side trips are slowing things
> down
> > too much. I appreciate the reviews that have found bugs in the code, but
> > I'm struggling with requests like this. I really need to limit the scope
> of
> > what I take on because there's a lot left to do and I'm doing it in my
> > spare time.
> >
> > So does that sound like a good plan? Or what should I do?
> >
> > Warner
> >
> > P.S. Sorry if my frustration is showing through too much...
>
> I don't see a reason for apologies here.
>
> Cooperation gets frustrating at times.  We may hide our frustration,
> stew in it until it becomes unbearable, then explode, or give up and go
> away.  All undesirable outcomes.  It's better to be open about it early,
> in a respectful manner.  This is what you did, and it's alright.
>
> It's okay to say "no, because" to reviewer requests.  We can then try to
> work out a path forward together.
>

I agree completely. My preemptive apology was because I wasn't sure if
my tone was becoming too sharp to maintain the necessary respect to
find that path forward together. I'm still learning the boundries for this
community with respect to pushback.

Warner

Patchew 2.1-devel-ea86937

© 2016 - 2026 Red Hat, Inc.