Acked-by: Hu Tao hutao@cn.fujitsu.com
On Wed, Mar 20, 2013 at 05:57:53PM +0200, Michael S. Tsirkin wrote:
You are getting this mail because you might have contributed code to one of the files in seabios that we want to reuse in QEMU, when this file was under GPLv3 or LGPLv3.
QEMU is GPLv2 at the moment, so as a step in the process of moving acpi tables to qemu, we need to make sure the code we'll be moving is GPLv2 compatible.
The code was originally LGPLv2 in bochs so these bits are OK.
QEMU generally prefers GPLv2 or later, so this is what this patch does. The plan is therefore:
- collect acks from everyone
- copy code to QEMU and apply this patch to QEMU copy only
If you allow the use of your contribution in QEMU under the terms of GPLv2 or later as proposed by this patch, please respond to this mail including the line:
Acked-by: Name <email address>
in the message body.
For example: Acked-by: Michael S. Tsirkin mst@redhat.com
Thanks!
Signed-off-by: Michael S. Tsirkin mst@redhat.com
diff --git a/src/acpi-dsdt-cpu-hotplug.dsl b/src/acpi-dsdt-cpu-hotplug.dsl index 0f3e83b..c96ac42 100644 --- a/src/acpi-dsdt-cpu-hotplug.dsl +++ b/src/acpi-dsdt-cpu-hotplug.dsl @@ -1,3 +1,18 @@ +/*
- 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/.
- */
/****************************************************************
- CPU hotplug
****************************************************************/ diff --git a/src/acpi-dsdt-dbug.dsl b/src/acpi-dsdt-dbug.dsl index 276321f..86230f7 100644 --- a/src/acpi-dsdt-dbug.dsl +++ b/src/acpi-dsdt-dbug.dsl @@ -1,3 +1,18 @@ +/*
- 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/.
- */
/****************************************************************
- Debugging
****************************************************************/ diff --git a/src/acpi-dsdt-hpet.dsl b/src/acpi-dsdt-hpet.dsl index f33e527..dfde174 100644 --- a/src/acpi-dsdt-hpet.dsl +++ b/src/acpi-dsdt-hpet.dsl @@ -1,3 +1,18 @@ +/*
- 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/.
- */
/****************************************************************
- HPET
****************************************************************/ diff --git a/src/acpi-dsdt-isa.dsl b/src/acpi-dsdt-isa.dsl index 23761db..89caa16 100644 --- a/src/acpi-dsdt-isa.dsl +++ b/src/acpi-dsdt-isa.dsl @@ -1,3 +1,18 @@ +/*
- 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/.
- */
/* Common legacy ISA style devices. */ Scope(_SB.PCI0.ISA) {
diff --git a/src/acpi-dsdt-pci-crs.dsl b/src/acpi-dsdt-pci-crs.dsl index d421891..b375a19 100644 --- a/src/acpi-dsdt-pci-crs.dsl +++ b/src/acpi-dsdt-pci-crs.dsl @@ -1,3 +1,18 @@ +/*
- 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/.
- */
/* PCI CRS (current resources) definition. */ Scope(_SB.PCI0) {
diff --git a/src/acpi.c b/src/acpi.c index 88abc09..4ed5b11 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -3,7 +3,19 @@ // Copyright (C) 2008-2010 Kevin O'Connor kevin@koconnor.net // Copyright (C) 2006 Fabrice Bellard // -// This file may be distributed under the terms of the GNU LGPLv3 license. +// 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/.
#include "acpi.h" // struct rsdp_descriptor #include "util.h" // memcpy diff --git a/src/acpi.h b/src/acpi.h index 7fbd082..9c2d849 100644 --- a/src/acpi.h +++ b/src/acpi.h @@ -1,3 +1,17 @@ +/*
- 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/.
- */
#ifndef __ACPI_H #define __ACPI_H
diff --git a/src/ssdt-misc.dsl b/src/ssdt-misc.dsl index 679422b..ac11e96 100644 --- a/src/ssdt-misc.dsl +++ b/src/ssdt-misc.dsl @@ -1,3 +1,18 @@ +/*
- 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/.
- */
ACPI_EXTRACT_ALL_CODE ssdp_misc_aml
DefinitionBlock ("ssdt-misc.aml", "SSDT", 0x01, "BXPC", "BXSSDTSUSP", 0x1) diff --git a/src/ssdt-pcihp.dsl b/src/ssdt-pcihp.dsl index 67e485f..d29a5b9 100644 --- a/src/ssdt-pcihp.dsl +++ b/src/ssdt-pcihp.dsl @@ -1,3 +1,18 @@ +/*
- 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/.
- */
ACPI_EXTRACT_ALL_CODE ssdp_pcihp_aml
DefinitionBlock ("ssdt-pcihp.aml", "SSDT", 0x01, "BXPC", "BXSSDTPCIHP", 0x1) diff --git a/src/ssdt-proc.dsl b/src/ssdt-proc.dsl index 407d61e..58333c7 100644 --- a/src/ssdt-proc.dsl +++ b/src/ssdt-proc.dsl @@ -1,3 +1,18 @@ +/*
- 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/.
- */
/* This file is the basis for the ssdt table generated in src/acpi.c.
- It defines the contents of the per-cpu Processor() object. At
- runtime, a dynamically generated SSDT will contain one copy of this
diff --git a/tools/acpi_extract.py b/tools/acpi_extract.py index ab8ced6..fbedc6b 100755 --- a/tools/acpi_extract.py +++ b/tools/acpi_extract.py @@ -1,7 +1,18 @@ #!/usr/bin/python # Copyright (C) 2011 Red Hat, Inc., Michael S. Tsirkin mst@redhat.com # -# This file may be distributed under the terms of the GNU GPLv3 license. +# 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/.
# Process mixed ASL/AML listing (.lst file) produced by iasl -l # Locate and execute ACPI_EXTRACT directives, output offset info diff --git a/tools/acpi_extract_preprocess.py b/tools/acpi_extract_preprocess.py index 4ae364e..c986160 100755 --- a/tools/acpi_extract_preprocess.py +++ b/tools/acpi_extract_preprocess.py @@ -1,7 +1,18 @@ #!/usr/bin/python # Copyright (C) 2011 Red Hat, Inc., Michael S. Tsirkin mst@redhat.com # -# This file may be distributed under the terms of the GNU GPLv3 license. +# 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/.
# Read a preprocessed ASL listing and put each ACPI_EXTRACT # directive in a comment, to make iasl skip it.
SeaBIOS mailing list SeaBIOS@seabios.org http://www.seabios.org/mailman/listinfo/seabios