The slirp source files have different license headers, sometime partial, sometime refering to COPYRIGHT file. All files under slirp are BSD-3. Add SPDX license identifier to clarify the license.
Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> --- slirp/src/bootp.h | 1 + slirp/src/debug.h | 1 + slirp/src/dhcpv6.h | 1 + slirp/src/if.h | 1 + slirp/src/ip.h | 1 + slirp/src/ip6.h | 1 + slirp/src/ip6_icmp.h | 1 + slirp/src/ip_icmp.h | 1 + slirp/src/libslirp.h | 1 + slirp/src/main.h | 1 + slirp/src/mbuf.h | 1 + slirp/src/misc.h | 1 + slirp/src/ncsi-pkt.h | 1 + slirp/src/qtailq.h | 1 + slirp/src/sbuf.h | 1 + slirp/src/slirp.h | 1 + slirp/src/socket.h | 1 + slirp/src/state.h | 0 slirp/src/stream.h | 1 + slirp/src/tcp.h | 1 + slirp/src/tcp_timer.h | 1 + slirp/src/tcp_var.h | 1 + slirp/src/tcpip.h | 1 + slirp/src/tftp.h | 1 + slirp/src/udp.h | 1 + slirp/src/util.h | 1 + slirp/src/vmstate.h | 1 + slirp/src/arp_table.c | 1 + slirp/src/bootp.c | 1 + slirp/src/cksum.c | 1 + slirp/src/dhcpv6.c | 1 + slirp/src/dnssearch.c | 1 + slirp/src/if.c | 1 + slirp/src/ip6_icmp.c | 1 + slirp/src/ip6_input.c | 1 + slirp/src/ip6_output.c | 1 + slirp/src/ip_icmp.c | 1 + slirp/src/ip_input.c | 1 + slirp/src/ip_output.c | 1 + slirp/src/mbuf.c | 1 + slirp/src/misc.c | 1 + slirp/src/ncsi.c | 1 + slirp/src/ndp_table.c | 1 + slirp/src/sbuf.c | 1 + slirp/src/slirp.c | 1 + slirp/src/socket.c | 1 + slirp/src/state.c | 1 + slirp/src/stream.c | 1 + slirp/src/tcp_input.c | 1 + slirp/src/tcp_output.c | 1 + slirp/src/tcp_subr.c | 1 + slirp/src/tcp_timer.c | 1 + slirp/src/tftp.c | 1 + slirp/src/udp.c | 1 + slirp/src/udp6.c | 1 + slirp/src/util.c | 1 + slirp/src/vmstate.c | 1 + 57 files changed, 56 insertions(+) delete mode 100644 slirp/src/state.h diff --git a/slirp/src/bootp.h b/slirp/src/bootp.h index 4043489835..d881ad620a 100644 --- a/slirp/src/bootp.h +++ b/slirp/src/bootp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* bootp/dhcp defines */ #ifndef SLIRP_BOOTP_H diff --git a/slirp/src/debug.h b/slirp/src/debug.h index 44d922df37..2e503ad7fa 100644 --- a/slirp/src/debug.h +++ b/slirp/src/debug.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. * diff --git a/slirp/src/dhcpv6.h b/slirp/src/dhcpv6.h index af0e193b06..dc26a93cff 100644 --- a/slirp/src/dhcpv6.h +++ b/slirp/src/dhcpv6.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Definitions and prototypes for SLIRP stateless DHCPv6 * diff --git a/slirp/src/if.h b/slirp/src/if.h index 69569c10df..8a60c4e052 100644 --- a/slirp/src/if.h +++ b/slirp/src/if.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. * diff --git a/slirp/src/ip.h b/slirp/src/ip.h index 73a4d2a3d2..1484de1176 100644 --- a/slirp/src/ip.h +++ b/slirp/src/ip.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/ip6.h b/slirp/src/ip6.h index 1b3364f960..33683c8e20 100644 --- a/slirp/src/ip6.h +++ b/slirp/src/ip6.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 2013 * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. diff --git a/slirp/src/ip6_icmp.h b/slirp/src/ip6_icmp.h index e8ed753db5..d8d13e30fc 100644 --- a/slirp/src/ip6_icmp.h +++ b/slirp/src/ip6_icmp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 2013 * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. diff --git a/slirp/src/ip_icmp.h b/slirp/src/ip_icmp.h index a4e5b8b265..05d85c59dd 100644 --- a/slirp/src/ip_icmp.h +++ b/slirp/src/ip_icmp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/libslirp.h b/slirp/src/libslirp.h index 2d13950065..3b28764bec 100644 --- a/slirp/src/libslirp.h +++ b/slirp/src/libslirp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ #ifndef LIBSLIRP_H #define LIBSLIRP_H diff --git a/slirp/src/main.h b/slirp/src/main.h index f11d4572b7..a88774215f 100644 --- a/slirp/src/main.h +++ b/slirp/src/main.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. * diff --git a/slirp/src/mbuf.h b/slirp/src/mbuf.h index e2d443418a..732c85c63c 100644 --- a/slirp/src/mbuf.h +++ b/slirp/src/mbuf.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/misc.h b/slirp/src/misc.h index c2ceadb591..4eaa2466d7 100644 --- a/slirp/src/misc.h +++ b/slirp/src/misc.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. * diff --git a/slirp/src/ncsi-pkt.h b/slirp/src/ncsi-pkt.h index 3867feb1d3..4c0be39f6e 100644 --- a/slirp/src/ncsi-pkt.h +++ b/slirp/src/ncsi-pkt.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright Gavin Shan, IBM Corporation 2016. * diff --git a/slirp/src/qtailq.h b/slirp/src/qtailq.h index a89b0c439a..d8aa0e19a4 100644 --- a/slirp/src/qtailq.h +++ b/slirp/src/qtailq.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* $NetBSD: queue.h,v 1.52 2009/04/20 09:56:08 mschuett Exp $ */ /* diff --git a/slirp/src/sbuf.h b/slirp/src/sbuf.h index 1cb9a42834..ece616e317 100644 --- a/slirp/src/sbuf.h +++ b/slirp/src/sbuf.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. * diff --git a/slirp/src/slirp.h b/slirp/src/slirp.h index 8068ba1d1e..39580934f3 100644 --- a/slirp/src/slirp.h +++ b/slirp/src/slirp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ #ifndef SLIRP_H #define SLIRP_H diff --git a/slirp/src/socket.h b/slirp/src/socket.h index e4d12cd591..10a0c78a26 100644 --- a/slirp/src/socket.h +++ b/slirp/src/socket.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. * diff --git a/slirp/src/state.h b/slirp/src/state.h deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/slirp/src/stream.h b/slirp/src/stream.h index 985334c043..08bb5b6610 100644 --- a/slirp/src/stream.h +++ b/slirp/src/stream.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ #ifndef STREAM_H_ #define STREAM_H_ diff --git a/slirp/src/tcp.h b/slirp/src/tcp.h index 47aaea6c5b..79d3251bb5 100644 --- a/slirp/src/tcp.h +++ b/slirp/src/tcp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/tcp_timer.h b/slirp/src/tcp_timer.h index b25b3911d7..709f63987a 100644 --- a/slirp/src/tcp_timer.h +++ b/slirp/src/tcp_timer.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/tcp_var.h b/slirp/src/tcp_var.h index 27ef1a51cb..162be6e95e 100644 --- a/slirp/src/tcp_var.h +++ b/slirp/src/tcp_var.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/tcpip.h b/slirp/src/tcpip.h index 07dbf2c432..560a86417c 100644 --- a/slirp/src/tcpip.h +++ b/slirp/src/tcpip.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/tftp.h b/slirp/src/tftp.h index a4c4a64e64..3fe3b70205 100644 --- a/slirp/src/tftp.h +++ b/slirp/src/tftp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* tftp defines */ #ifndef SLIRP_TFTP_H diff --git a/slirp/src/udp.h b/slirp/src/udp.h index 3d29504caa..29c0297179 100644 --- a/slirp/src/udp.h +++ b/slirp/src/udp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/util.h b/slirp/src/util.h index e94ee4e7f1..bbe578a2eb 100644 --- a/slirp/src/util.h +++ b/slirp/src/util.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 2003-2008 Fabrice Bellard * Copyright (c) 2010-2019 Red Hat, Inc. diff --git a/slirp/src/vmstate.h b/slirp/src/vmstate.h index 21157b5ec2..44efea7b50 100644 --- a/slirp/src/vmstate.h +++ b/slirp/src/vmstate.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * QEMU migration/snapshot declarations * diff --git a/slirp/src/arp_table.c b/slirp/src/arp_table.c index 58eafdcfd8..6fee5c1abd 100644 --- a/slirp/src/arp_table.c +++ b/slirp/src/arp_table.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * ARP table * diff --git a/slirp/src/bootp.c b/slirp/src/bootp.c index d396849a05..b3ae539dc1 100644 --- a/slirp/src/bootp.c +++ b/slirp/src/bootp.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * QEMU BOOTP/DHCP server * diff --git a/slirp/src/cksum.c b/slirp/src/cksum.c index 25bfa67348..9599f6a280 100644 --- a/slirp/src/cksum.c +++ b/slirp/src/cksum.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1988, 1992, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/dhcpv6.c b/slirp/src/dhcpv6.c index df350e9f26..3c8f420912 100644 --- a/slirp/src/dhcpv6.c +++ b/slirp/src/dhcpv6.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * SLIRP stateless DHCPv6 * diff --git a/slirp/src/dnssearch.c b/slirp/src/dnssearch.c index c459cece8d..5bf532d047 100644 --- a/slirp/src/dnssearch.c +++ b/slirp/src/dnssearch.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Domain search option for DHCP (RFC 3397) * diff --git a/slirp/src/if.c b/slirp/src/if.c index 1830cc396c..b8cddebf66 100644 --- a/slirp/src/if.c +++ b/slirp/src/if.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. * diff --git a/slirp/src/ip6_icmp.c b/slirp/src/ip6_icmp.c index c1e3d30470..5642457fdd 100644 --- a/slirp/src/ip6_icmp.c +++ b/slirp/src/ip6_icmp.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 2013 * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. diff --git a/slirp/src/ip6_input.c b/slirp/src/ip6_input.c index 1b8c003c66..d9d2b7e9cd 100644 --- a/slirp/src/ip6_input.c +++ b/slirp/src/ip6_input.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 2013 * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. diff --git a/slirp/src/ip6_output.c b/slirp/src/ip6_output.c index 19d1ae7748..b86110662c 100644 --- a/slirp/src/ip6_output.c +++ b/slirp/src/ip6_output.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 2013 * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. diff --git a/slirp/src/ip_icmp.c b/slirp/src/ip_icmp.c index 120108f582..1aea18afa7 100644 --- a/slirp/src/ip_icmp.c +++ b/slirp/src/ip_icmp.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/ip_input.c b/slirp/src/ip_input.c index e0b94b0e42..6ad6765938 100644 --- a/slirp/src/ip_input.c +++ b/slirp/src/ip_input.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/ip_output.c b/slirp/src/ip_output.c index f6ec141df5..9299997efb 100644 --- a/slirp/src/ip_output.c +++ b/slirp/src/ip_output.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/mbuf.c b/slirp/src/mbuf.c index 521c02c967..f079a86d78 100644 --- a/slirp/src/mbuf.c +++ b/slirp/src/mbuf.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski * diff --git a/slirp/src/misc.c b/slirp/src/misc.c index 937a418d4e..da41f3bb5f 100644 --- a/slirp/src/misc.c +++ b/slirp/src/misc.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. * diff --git a/slirp/src/ncsi.c b/slirp/src/ncsi.c index 1169da8241..6d574ec5ec 100644 --- a/slirp/src/ncsi.c +++ b/slirp/src/ncsi.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * NC-SI (Network Controller Sideband Interface) "echo" model * diff --git a/slirp/src/ndp_table.c b/slirp/src/ndp_table.c index 34ea4fdf1f..78324877e2 100644 --- a/slirp/src/ndp_table.c +++ b/slirp/src/ndp_table.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 2013 * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. diff --git a/slirp/src/sbuf.c b/slirp/src/sbuf.c index 51a9f0cc7d..815823ffbe 100644 --- a/slirp/src/sbuf.c +++ b/slirp/src/sbuf.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. * diff --git a/slirp/src/slirp.c b/slirp/src/slirp.c index 18af670a0a..8eddf338c2 100644 --- a/slirp/src/slirp.c +++ b/slirp/src/slirp.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * libslirp glue * diff --git a/slirp/src/socket.c b/slirp/src/socket.c index f2428a3ae8..ad58262a06 100644 --- a/slirp/src/socket.c +++ b/slirp/src/socket.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. * diff --git a/slirp/src/state.c b/slirp/src/state.c index f5dd80cdc8..533c67205a 100644 --- a/slirp/src/state.c +++ b/slirp/src/state.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * libslirp * diff --git a/slirp/src/stream.c b/slirp/src/stream.c index d114dde334..902af05694 100644 --- a/slirp/src/stream.c +++ b/slirp/src/stream.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * libslirp io streams * diff --git a/slirp/src/tcp_input.c b/slirp/src/tcp_input.c index b10477fc57..cf54eeee92 100644 --- a/slirp/src/tcp_input.c +++ b/slirp/src/tcp_input.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/tcp_output.c b/slirp/src/tcp_output.c index e9674df121..272c261d07 100644 --- a/slirp/src/tcp_output.c +++ b/slirp/src/tcp_output.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/tcp_subr.c b/slirp/src/tcp_subr.c index 1db59caa89..086e4e98e2 100644 --- a/slirp/src/tcp_subr.c +++ b/slirp/src/tcp_subr.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/tcp_timer.c b/slirp/src/tcp_timer.c index 7be54570af..be361a1bb6 100644 --- a/slirp/src/tcp_timer.c +++ b/slirp/src/tcp_timer.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/tftp.c b/slirp/src/tftp.c index 2d8f978786..612cbf0398 100644 --- a/slirp/src/tftp.c +++ b/slirp/src/tftp.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * tftp.c - a simple, read-only tftp server for qemu * diff --git a/slirp/src/udp.c b/slirp/src/udp.c index fa9f4a08bd..27bb829c37 100644 --- a/slirp/src/udp.c +++ b/slirp/src/udp.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/udp6.c b/slirp/src/udp6.c index be5cba1f54..bfcc7ec6fa 100644 --- a/slirp/src/udp6.c +++ b/slirp/src/udp6.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 2013 * Guillaume Subiron diff --git a/slirp/src/util.c b/slirp/src/util.c index 5ec2fa87ab..1b2e1e8ee3 100644 --- a/slirp/src/util.c +++ b/slirp/src/util.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * util.c (mostly based on QEMU os-win32.c) * diff --git a/slirp/src/vmstate.c b/slirp/src/vmstate.c index 3bc23d1d73..43bb3ebc6f 100644 --- a/slirp/src/vmstate.c +++ b/slirp/src/vmstate.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * VMState interpreter * -- 2.21.0.4.g36eb1cb9cf