From aae049073c5b5797ca3d11cc562f0bcd0a20cfb5 Mon Sep 17 00:00:00 2001 From: kumar sourav Date: Thu, 24 Jan 2019 20:16:06 +0530 Subject: [PATCH 01/13] hw: edu: set category of the edu device Sets the category of edu device as DEVICE_CATEGORY_MISC. Devices should be assigned to one of DEVICE_CATEGORY_XXXX. Signed-off-by: kumar sourav Reviewed-by: Thomas Huth Message-Id: <20190124144606.4352-1-sourav.jb1988@gmail.com> Signed-off-by: Laurent Vivier --- hw/misc/edu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/misc/edu.c b/hw/misc/edu.c index ceaf688bfb..91af452c9e 100644 --- a/hw/misc/edu.c +++ b/hw/misc/edu.c @@ -399,6 +399,7 @@ static void edu_instance_init(Object *obj) static void edu_class_init(ObjectClass *class, void *data) { + DeviceClass *dc = DEVICE_CLASS(class); PCIDeviceClass *k = PCI_DEVICE_CLASS(class); k->realize = pci_edu_realize; @@ -407,6 +408,7 @@ static void edu_class_init(ObjectClass *class, void *data) k->device_id = 0x11e8; k->revision = 0x10; k->class_id = PCI_CLASS_OTHERS; + set_bit(DEVICE_CATEGORY_MISC, dc->categories); } static void pci_edu_register_types(void) From 89cb0c0403f27cdb040fc8bf84749333f3248e38 Mon Sep 17 00:00:00 2001 From: "Dr. David Alan Gilbert" Date: Fri, 25 Jan 2019 09:40:46 +0000 Subject: [PATCH 02/13] typo: apci->acpi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit apci_1_compatible should be acpi_1_compatible. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20190125094047.22276-1-dgilbert@redhat.com> Signed-off-by: Laurent Vivier --- hw/acpi/cpu.c | 2 +- hw/i386/acpi-build.c | 2 +- include/hw/acpi/cpu.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c index f10b190019..a0a43fe6b5 100644 --- a/hw/acpi/cpu.c +++ b/hw/acpi/cpu.c @@ -508,7 +508,7 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts, GArray *madt_buf = g_array_new(0, 1, 1); int arch_id = arch_ids->cpus[i].arch_id; - if (opts.apci_1_compatible && arch_id < 255) { + if (opts.acpi_1_compatible && arch_id < 255) { dev = aml_processor(i, 0, 0, CPU_NAME_FMT, i); } else { dev = aml_device(CPU_NAME_FMT, i); diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 2e21a31f82..d60603abd7 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1847,7 +1847,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, build_legacy_cpu_hotplug_aml(dsdt, machine, pm->cpu_hp_io_base); } else { CPUHotplugFeatures opts = { - .apci_1_compatible = true, .has_legacy_cphp = true + .acpi_1_compatible = true, .has_legacy_cphp = true }; build_cpus_aml(dsdt, machine, opts, pm->cpu_hp_io_base, "\\_SB.PCI0", "\\_GPE._E02"); diff --git a/include/hw/acpi/cpu.h b/include/hw/acpi/cpu.h index 89ce172941..62f0278ba2 100644 --- a/include/hw/acpi/cpu.h +++ b/include/hw/acpi/cpu.h @@ -48,7 +48,7 @@ void cpu_hotplug_hw_init(MemoryRegion *as, Object *owner, CPUHotplugState *state, hwaddr base_addr); typedef struct CPUHotplugFeatures { - bool apci_1_compatible; + bool acpi_1_compatible; bool has_legacy_cphp; } CPUHotplugFeatures; From cbe9ed73f905b532918603c04807bfa84d6051fb Mon Sep 17 00:00:00 2001 From: kumar sourav Date: Fri, 25 Jan 2019 20:44:40 +0530 Subject: [PATCH 03/13] hw: input: set category of the i8042 device MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sets the category of i8042 device as DEVICE_CATEGORY_INPUT Devices should be assigned to one of DEVICE_CATEGORY_XXXX. Signed-off-by: kumar sourav Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Michael S. Tsirkin Message-Id: <20190125151440.13794-1-sourav.jb1988@gmail.com> Signed-off-by: Laurent Vivier --- hw/input/pckbd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index 3e66713b47..72e7d5f6cc 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -574,6 +574,7 @@ static void i8042_class_initfn(ObjectClass *klass, void *data) dc->realize = i8042_realizefn; dc->vmsd = &vmstate_kbd_isa; + set_bit(DEVICE_CATEGORY_INPUT, dc->categories); } static const TypeInfo i8042_info = { From 2bbf3a91eb49aba488f586a06d15eb555a36e1e6 Mon Sep 17 00:00:00 2001 From: kumar sourav Date: Thu, 24 Jan 2019 21:50:45 +0530 Subject: [PATCH 04/13] hw: sd: set category of the sd memory card MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sets the category of the sd memory card as DEVICE_CATEGORY_STORAGE. Devices should be assigned to one of DEVICE_CATEGORY_XXXX. Signed-off-by: kumar sourav Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Message-Id: <20190124162045.10474-1-sourav.jb1988@gmail.com> Signed-off-by: Laurent Vivier --- hw/sd/sd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index d4356e9b73..aaab15f386 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -2121,6 +2121,7 @@ static void sd_class_init(ObjectClass *klass, void *data) dc->vmsd = &sd_vmstate; dc->reset = sd_reset; dc->bus_type = TYPE_SD_BUS; + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); sc->set_voltage = sd_set_voltage; sc->get_dat_lines = sd_get_dat_lines; From e361a772ffcd33675ffdd4637eea98a460dfed1b Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Wed, 23 Jan 2019 15:51:23 +0100 Subject: [PATCH 05/13] Don't talk about the LGPL if the file is licensed under the GPL Some files claim that the code is licensed under the GPL, but then suddenly suggest that the user should have a look at the LGPL. That's of course non-sense, replace it with the correct GPL wording instead. Signed-off-by: Thomas Huth Message-Id: <1548255083-8190-1-git-send-email-thuth@redhat.com> Reviewed-by: Laurent Vivier Signed-off-by: Laurent Vivier --- crypto/afsplit.c | 11 +++++------ include/crypto/afsplit.h | 11 +++++------ include/hw/pci-host/gpex.h | 4 ++-- include/hw/pci-host/q35.h | 4 ++-- include/qemu/range.h | 11 +++++------ target/i386/hvf/hvf.c | 6 +++--- util/range.c | 11 +++++------ 7 files changed, 27 insertions(+), 31 deletions(-) diff --git a/crypto/afsplit.c b/crypto/afsplit.c index 825e2cff26..328d68c96b 100644 --- a/crypto/afsplit.c +++ b/crypto/afsplit.c @@ -8,19 +8,18 @@ * Copyright (C) 2004, Clemens Fruhwirth * Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or + * 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 library is distributed in the hope that it will be useful, + * 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 - * 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 . + * 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 . */ #include "qemu/osdep.h" diff --git a/include/crypto/afsplit.h b/include/crypto/afsplit.h index 7dd21f0a67..4894d64330 100644 --- a/include/crypto/afsplit.h +++ b/include/crypto/afsplit.h @@ -3,19 +3,18 @@ * * Copyright (c) 2015-2016 Red Hat, Inc. * - * This library is free software; you can redistribute it and/or + * 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 library is distributed in the hope that it will be useful, + * 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 - * 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 . + * 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 . */ #ifndef QCRYPTO_AFSPLIT_H diff --git a/include/hw/pci-host/gpex.h b/include/hw/pci-host/gpex.h index aef38b881b..2af1c4a37e 100644 --- a/include/hw/pci-host/gpex.h +++ b/include/hw/pci-host/gpex.h @@ -13,8 +13,8 @@ * 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 Lesser General Public - * License along with this library; if not, see + * You should have received a copy of the GNU General Public License + * along with this program; if not, see */ #ifndef HW_GPEX_H diff --git a/include/hw/pci-host/q35.h b/include/hw/pci-host/q35.h index 8f4ddde393..5ed77facd0 100644 --- a/include/hw/pci-host/q35.h +++ b/include/hw/pci-host/q35.h @@ -15,8 +15,8 @@ * 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 Lesser General Public - * License along with this library; if not, see + * You should have received a copy of the GNU General Public License + * along with this program; if not, see */ #ifndef HW_Q35_H diff --git a/include/qemu/range.h b/include/qemu/range.h index ba606c6bc0..71b8b215c6 100644 --- a/include/qemu/range.h +++ b/include/qemu/range.h @@ -3,19 +3,18 @@ * * Copyright (c) 2015-2016 Red Hat, Inc. * - * This library is free software; you can redistribute it and/or + * 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 library is distributed in the hope that it will be useful, + * 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this library; if not, see . + * 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 . */ #ifndef QEMU_RANGE_H diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c index e193022c03..689b585027 100644 --- a/target/i386/hvf/hvf.c +++ b/target/i386/hvf/hvf.c @@ -13,10 +13,10 @@ * 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 - * Lesser General Public License for more details. + * General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . * * This file contain code under public domain from the hvdos project: * https://github.com/mist64/hvdos diff --git a/util/range.c b/util/range.c index 416df7cdae..098d9d2dc0 100644 --- a/util/range.c +++ b/util/range.c @@ -3,19 +3,18 @@ * * Copyright (c) 2015-2016 Red Hat, Inc. * - * This library is free software; you can redistribute it and/or + * 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 library is distributed in the hope that it will be useful, + * 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this library; if not, see . + * 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 . */ #include "qemu/osdep.h" From f0d44cc4462f112bce5ec556e87eff4eec682e39 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Wed, 23 Jan 2019 15:08:53 +0100 Subject: [PATCH 06/13] COPYING.LIB: Synchronize the LGPL 2.1 with the version from gnu.org The current version of the LGPL 2.1 from gnu.org (see the URL https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt ) slightly differs from the old one that we use in our repository. Especially the recommendation to use "either version 2 of the License, or [...] any later version" is somewhat misleading, since there was never a "version 2" of the "Lesser GPL" license - the "version 2" was still called "Library GPL" instead. Signed-off-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <1548252536-6242-2-git-send-email-thuth@redhat.com> Signed-off-by: Laurent Vivier --- COPYING.LIB | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/COPYING.LIB b/COPYING.LIB index 48afc2efd7..4362b49151 100644 --- a/COPYING.LIB +++ b/COPYING.LIB @@ -1,8 +1,8 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -10,7 +10,7 @@ as the successor of the GNU Library Public License, version 2, hence the version number 2.1.] - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -112,7 +112,7 @@ modification follow. Pay close attention to the difference between a former contains code derived from the library, whereas the latter must be combined with the library in order to run. - GNU LESSER GENERAL PUBLIC LICENSE + GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License Agreement applies to any software library or other @@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. - + 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an @@ -432,7 +432,7 @@ decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. @@ -455,7 +455,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Libraries @@ -476,7 +476,7 @@ convey the exclusion of warranty; and each file should have at least the 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. + version 2.1 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 @@ -485,7 +485,7 @@ convey the exclusion of warranty; and each file should have at least the You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. @@ -500,5 +500,3 @@ necessary. Here is a sample; alter the names: Ty Coon, President of Vice That's all there is to it! - - From 779fc6ada1002b0466878e05832b08e44f0195ec Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Wed, 23 Jan 2019 15:08:54 +0100 Subject: [PATCH 07/13] target/openrisc: Fix LGPL version number It's either "GNU *Library* General Public version 2" or "GNU Lesser General Public version *2.1*", but there was no "version 2.0" of the "Lesser" library. So assume that version 2.1 is meant here. Cc: Stafford Horne Signed-off-by: Thomas Huth Acked-by: Stafford Horne Reviewed-by: Richard Henderson Message-Id: <1548252536-6242-3-git-send-email-thuth@redhat.com> Signed-off-by: Laurent Vivier --- target/openrisc/cpu.c | 2 +- target/openrisc/exception.h | 2 +- target/openrisc/gdbstub.c | 2 +- target/openrisc/helper.h | 2 +- target/openrisc/interrupt_helper.c | 2 +- target/openrisc/sys_helper.c | 2 +- target/openrisc/translate.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c index fb7cb5c507..541b2a66c7 100644 --- a/target/openrisc/cpu.c +++ b/target/openrisc/cpu.c @@ -6,7 +6,7 @@ * 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. + * version 2.1 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 diff --git a/target/openrisc/exception.h b/target/openrisc/exception.h index 4ec56b4653..c9c4e471d2 100644 --- a/target/openrisc/exception.h +++ b/target/openrisc/exception.h @@ -6,7 +6,7 @@ * 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. + * version 2.1 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 diff --git a/target/openrisc/gdbstub.c b/target/openrisc/gdbstub.c index f9af6507f3..43b1a18d4b 100644 --- a/target/openrisc/gdbstub.c +++ b/target/openrisc/gdbstub.c @@ -7,7 +7,7 @@ * 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. + * version 2.1 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 diff --git a/target/openrisc/helper.h b/target/openrisc/helper.h index 9db9bf3963..96d79a8113 100644 --- a/target/openrisc/helper.h +++ b/target/openrisc/helper.h @@ -6,7 +6,7 @@ * 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. + * version 2.1 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 diff --git a/target/openrisc/interrupt_helper.c b/target/openrisc/interrupt_helper.c index 9c5489f5f7..ab4ea88b69 100644 --- a/target/openrisc/interrupt_helper.c +++ b/target/openrisc/interrupt_helper.c @@ -7,7 +7,7 @@ * 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. + * version 2.1 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 diff --git a/target/openrisc/sys_helper.c b/target/openrisc/sys_helper.c index b66a45c1e0..05f66c455b 100644 --- a/target/openrisc/sys_helper.c +++ b/target/openrisc/sys_helper.c @@ -7,7 +7,7 @@ * 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. + * version 2.1 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 diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index c089914d6a..89680f882d 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -7,7 +7,7 @@ * 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. + * version 2.1 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 From 02754acd8991cb644d2d588764ea6d2f2d09e725 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Wed, 23 Jan 2019 15:08:55 +0100 Subject: [PATCH 08/13] target/tricore: Fix LGPL version number It's either "GNU *Library* General Public version 2" or "GNU Lesser General Public version *2.1*", but there was no "version 2.0" of the "Lesser" library. So assume that version 2.1 is meant here. Cc: Bastian Koppelmann Signed-off-by: Thomas Huth Acked-by: Bastian Koppelmann Reviewed-by: Richard Henderson Message-Id: <1548252536-6242-4-git-send-email-thuth@redhat.com> Signed-off-by: Laurent Vivier --- target/tricore/cpu-qom.h | 2 +- target/tricore/cpu.c | 2 +- target/tricore/cpu.h | 2 +- target/tricore/fpu_helper.c | 2 +- target/tricore/helper.c | 2 +- target/tricore/helper.h | 2 +- target/tricore/op_helper.c | 2 +- target/tricore/translate.c | 2 +- target/tricore/tricore-defs.h | 2 +- target/tricore/tricore-opcodes.h | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/target/tricore/cpu-qom.h b/target/tricore/cpu-qom.h index 6a69756126..93c9d77fe3 100644 --- a/target/tricore/cpu-qom.h +++ b/target/tricore/cpu-qom.h @@ -4,7 +4,7 @@ * 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. + * version 2.1 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 diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c index 2edaef1aef..e8d37e4040 100644 --- a/target/tricore/cpu.c +++ b/target/tricore/cpu.c @@ -6,7 +6,7 @@ * 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. + * version 2.1 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 diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h index c3665c6ddd..00e69dc154 100644 --- a/target/tricore/cpu.h +++ b/target/tricore/cpu.h @@ -6,7 +6,7 @@ * 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. + * version 2.1 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 diff --git a/target/tricore/fpu_helper.c b/target/tricore/fpu_helper.c index 31df462e4a..d8a6c0d25b 100644 --- a/target/tricore/fpu_helper.c +++ b/target/tricore/fpu_helper.c @@ -6,7 +6,7 @@ * 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. + * version 2.1 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 diff --git a/target/tricore/helper.c b/target/tricore/helper.c index dad7eea085..0769046993 100644 --- a/target/tricore/helper.c +++ b/target/tricore/helper.c @@ -4,7 +4,7 @@ * 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. + * version 2.1 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 diff --git a/target/tricore/helper.h b/target/tricore/helper.h index e634d0c680..f60e81096b 100644 --- a/target/tricore/helper.h +++ b/target/tricore/helper.h @@ -4,7 +4,7 @@ * 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. + * version 2.1 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 diff --git a/target/tricore/op_helper.c b/target/tricore/op_helper.c index b57f35387d..ed9dc0c83e 100644 --- a/target/tricore/op_helper.c +++ b/target/tricore/op_helper.c @@ -4,7 +4,7 @@ * 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. + * version 2.1 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 diff --git a/target/tricore/translate.c b/target/tricore/translate.c index b5ab40d4a2..14f0ddfa1e 100644 --- a/target/tricore/translate.c +++ b/target/tricore/translate.c @@ -6,7 +6,7 @@ * 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. + * version 2.1 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 diff --git a/target/tricore/tricore-defs.h b/target/tricore/tricore-defs.h index 40abfaac14..e871aa1c6b 100644 --- a/target/tricore/tricore-defs.h +++ b/target/tricore/tricore-defs.h @@ -4,7 +4,7 @@ * 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. + * version 2.1 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 diff --git a/target/tricore/tricore-opcodes.h b/target/tricore/tricore-opcodes.h index 2c3baab694..40bc121ba4 100644 --- a/target/tricore/tricore-opcodes.h +++ b/target/tricore/tricore-opcodes.h @@ -4,7 +4,7 @@ * 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. + * version 2.1 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 From fb0343d5b4dd4b9b9e96e563d913a3e0c709fe4e Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Wed, 23 Jan 2019 15:08:56 +0100 Subject: [PATCH 09/13] tcg: Fix LGPL version number It's either "GNU *Library* General Public version 2" or "GNU Lesser General Public version *2.1*", but there was no "version 2.0" of the "Lesser" library. So assume that version 2.1 is meant here. Cc: Richard Henderson Signed-off-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <1548252536-6242-5-git-send-email-thuth@redhat.com> Signed-off-by: Laurent Vivier --- accel/tcg/atomic_template.h | 2 +- accel/tcg/cpu-exec-common.c | 2 +- accel/tcg/cpu-exec.c | 2 +- accel/tcg/cputlb.c | 2 +- accel/tcg/softmmu_template.h | 2 +- accel/tcg/tcg-runtime-gvec.c | 2 +- accel/tcg/translate-all.c | 2 +- accel/tcg/translate-all.h | 2 +- accel/tcg/user-exec.c | 2 +- tcg/tcg-gvec-desc.h | 2 +- tcg/tcg-op-gvec.c | 2 +- tcg/tcg-op-gvec.h | 2 +- tcg/tcg-op-vec.c | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/accel/tcg/atomic_template.h b/accel/tcg/atomic_template.h index efde12fdb2..685602b076 100644 --- a/accel/tcg/atomic_template.h +++ b/accel/tcg/atomic_template.h @@ -7,7 +7,7 @@ * 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. + * version 2.1 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 diff --git a/accel/tcg/cpu-exec-common.c b/accel/tcg/cpu-exec-common.c index 2988fde650..462a1f1865 100644 --- a/accel/tcg/cpu-exec-common.c +++ b/accel/tcg/cpu-exec-common.c @@ -6,7 +6,7 @@ * 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. + * version 2.1 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 diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 6c4a33262f..7cf1292546 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -6,7 +6,7 @@ * 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. + * version 2.1 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 diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index dad9b7796c..f580e4dd7e 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -6,7 +6,7 @@ * 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. + * version 2.1 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 diff --git a/accel/tcg/softmmu_template.h b/accel/tcg/softmmu_template.h index b0adea045e..1fdd262ea4 100644 --- a/accel/tcg/softmmu_template.h +++ b/accel/tcg/softmmu_template.h @@ -11,7 +11,7 @@ * 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. + * version 2.1 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 diff --git a/accel/tcg/tcg-runtime-gvec.c b/accel/tcg/tcg-runtime-gvec.c index 9358749741..e2c6f24262 100644 --- a/accel/tcg/tcg-runtime-gvec.c +++ b/accel/tcg/tcg-runtime-gvec.c @@ -6,7 +6,7 @@ * 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. + * version 2.1 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 diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 7364e8a071..8f593b926f 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -6,7 +6,7 @@ * 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. + * version 2.1 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 diff --git a/accel/tcg/translate-all.h b/accel/tcg/translate-all.h index 08e2f23a46..64f5fd9a05 100644 --- a/accel/tcg/translate-all.h +++ b/accel/tcg/translate-all.h @@ -6,7 +6,7 @@ * 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. + * version 2.1 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 diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 66cc818e3f..0789984fe6 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -6,7 +6,7 @@ * 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. + * version 2.1 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 diff --git a/tcg/tcg-gvec-desc.h b/tcg/tcg-gvec-desc.h index 3b4c2d9c69..2dda7d6ba1 100644 --- a/tcg/tcg-gvec-desc.h +++ b/tcg/tcg-gvec-desc.h @@ -6,7 +6,7 @@ * 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. + * version 2.1 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 diff --git a/tcg/tcg-op-gvec.c b/tcg/tcg-op-gvec.c index 3ee44fcb75..0996ef0812 100644 --- a/tcg/tcg-op-gvec.c +++ b/tcg/tcg-op-gvec.c @@ -6,7 +6,7 @@ * 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. + * version 2.1 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 diff --git a/tcg/tcg-op-gvec.h b/tcg/tcg-op-gvec.h index 4734eef7de..850da32ded 100644 --- a/tcg/tcg-op-gvec.h +++ b/tcg/tcg-op-gvec.h @@ -6,7 +6,7 @@ * 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. + * version 2.1 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 diff --git a/tcg/tcg-op-vec.c b/tcg/tcg-op-vec.c index 36f35022ac..27f65600c3 100644 --- a/tcg/tcg-op-vec.c +++ b/tcg/tcg-op-vec.c @@ -6,7 +6,7 @@ * 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. + * version 2.1 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 From 41c6a6dd84f36b33b3cc6e4a3512455b471d8845 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Tue, 29 Jan 2019 14:37:47 +0100 Subject: [PATCH 10/13] target/s390x: Fix LGPL version in the file header comments It's either "GNU *Library* General Public License version 2" or "GNU Lesser General Public License version *2.1*", but there was no "version 2.0" of the "Lesser" license. So assume that version 2.1 is meant here. Signed-off-by: Thomas Huth Acked-by: Cornelia Huck Message-Id: <1548769067-20792-1-git-send-email-thuth@redhat.com> Signed-off-by: Laurent Vivier --- target/s390x/cc_helper.c | 2 +- target/s390x/excp_helper.c | 2 +- target/s390x/fpu_helper.c | 2 +- target/s390x/gdbstub.c | 2 +- target/s390x/helper.c | 2 +- target/s390x/int_helper.c | 2 +- target/s390x/mem_helper.c | 2 +- target/s390x/misc_helper.c | 2 +- target/s390x/translate.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/target/s390x/cc_helper.c b/target/s390x/cc_helper.c index 5d91e458a8..307ad61aee 100644 --- a/target/s390x/cc_helper.c +++ b/target/s390x/cc_helper.c @@ -7,7 +7,7 @@ * 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. + * version 2.1 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 diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c index 2a33222f7e..a758649f47 100644 --- a/target/s390x/excp_helper.c +++ b/target/s390x/excp_helper.c @@ -7,7 +7,7 @@ * 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. + * version 2.1 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 diff --git a/target/s390x/fpu_helper.c b/target/s390x/fpu_helper.c index 1b662d2520..e921172bc4 100644 --- a/target/s390x/fpu_helper.c +++ b/target/s390x/fpu_helper.c @@ -7,7 +7,7 @@ * 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. + * version 2.1 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 diff --git a/target/s390x/gdbstub.c b/target/s390x/gdbstub.c index b8c81dadcf..df147596ce 100644 --- a/target/s390x/gdbstub.c +++ b/target/s390x/gdbstub.c @@ -7,7 +7,7 @@ * 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. + * version 2.1 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 diff --git a/target/s390x/helper.c b/target/s390x/helper.c index 254631693d..3d74836a83 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -7,7 +7,7 @@ * 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. + * version 2.1 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 diff --git a/target/s390x/int_helper.c b/target/s390x/int_helper.c index abf77a94e6..abbbc20d9c 100644 --- a/target/s390x/int_helper.c +++ b/target/s390x/int_helper.c @@ -7,7 +7,7 @@ * 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. + * version 2.1 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 diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 490c43e6e6..a506d9ef99 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -7,7 +7,7 @@ * 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. + * version 2.1 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 diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c index 3f91579570..52262f62df 100644 --- a/target/s390x/misc_helper.c +++ b/target/s390x/misc_helper.c @@ -7,7 +7,7 @@ * 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. + * version 2.1 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 diff --git a/target/s390x/translate.c b/target/s390x/translate.c index b5bd56b7ee..6249c70d02 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -7,7 +7,7 @@ * 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. + * version 2.1 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 From d749fb85bd35f2f175a4ed3d170561e4f54f7297 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Tue, 29 Jan 2019 14:43:58 +0100 Subject: [PATCH 11/13] target/m68k: Fix LGPL information in the file headers It's either "GNU *Library* General Public License version 2" or "GNU Lesser General Public License version *2.1*", but there was no "version 2.0" of the "Lesser" license. So assume that version 2.1 is meant here. Also some files mention the GPL instead of the LGPL after declaring that the files are licensed under the LGPL, so change these spots to use LGPL, too. Reviewed-by: Liam Merwick Signed-off-by: Thomas Huth Message-Id: <1548769438-28942-1-git-send-email-thuth@redhat.com> Signed-off-by: Laurent Vivier --- linux-user/m68k/target_cpu.h | 4 ++-- linux-user/m68k/target_structs.h | 2 +- target/m68k/cpu.h | 4 ++-- target/m68k/fpu_helper.c | 4 ++-- target/m68k/gdbstub.c | 2 +- target/m68k/helper.c | 4 ++-- target/m68k/op_helper.c | 2 +- target/m68k/translate.c | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/linux-user/m68k/target_cpu.h b/linux-user/m68k/target_cpu.h index 611df065ca..7a26f3c3fc 100644 --- a/linux-user/m68k/target_cpu.h +++ b/linux-user/m68k/target_cpu.h @@ -7,12 +7,12 @@ * 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. + * version 2.1 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 - * General Public License for more details. + * 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 . diff --git a/linux-user/m68k/target_structs.h b/linux-user/m68k/target_structs.h index a003676548..e373d481e1 100644 --- a/linux-user/m68k/target_structs.h +++ b/linux-user/m68k/target_structs.h @@ -6,7 +6,7 @@ * 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. + * version 2.1 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 diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index b288a3864e..f154565117 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -7,12 +7,12 @@ * 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. + * version 2.1 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 - * General Public License for more details. + * 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 . diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index 6eeffdf9bb..b35489ba4e 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -7,12 +7,12 @@ * 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. + * version 2.1 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 - * General Public License for more details. + * 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 . diff --git a/target/m68k/gdbstub.c b/target/m68k/gdbstub.c index 99e5be8132..fd2bb46c42 100644 --- a/target/m68k/gdbstub.c +++ b/target/m68k/gdbstub.c @@ -7,7 +7,7 @@ * 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. + * version 2.1 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 diff --git a/target/m68k/helper.c b/target/m68k/helper.c index 917d46efcc..3e26d337bf 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -7,12 +7,12 @@ * 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. + * version 2.1 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 - * General Public License for more details. + * 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 . diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c index 8d09ed91c4..76f439985a 100644 --- a/target/m68k/op_helper.c +++ b/target/m68k/op_helper.c @@ -6,7 +6,7 @@ * 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. + * version 2.1 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 diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 752e46ef63..6217a683f1 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -7,12 +7,12 @@ * 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. + * version 2.1 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 - * General Public License for more details. + * 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 . From 36f1f0d26eeec59c842a061603946f7c5ace4941 Mon Sep 17 00:00:00 2001 From: Paul Durrant Date: Tue, 22 Jan 2019 14:51:32 +0000 Subject: [PATCH 12/13] hw/block: clean up stale xen_disk trace entries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This should have been removed then xen_disk.c was removed but I missed them. Fixes: 19f87870baa570bcd7e80e7657e030bf427f16be xen: remove the legacy 'xen_disk' backend Signed-off-by: Paul Durrant Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20190122145132.12571-1-paul.durrant@citrix.com> [lv: s/stake/stale/ and add "Fixes" tag] Signed-off-by: Laurent Vivier --- hw/block/trace-events | 7 ------- 1 file changed, 7 deletions(-) diff --git a/hw/block/trace-events b/hw/block/trace-events index 55e5a5500c..d0851953c5 100644 --- a/hw/block/trace-events +++ b/hw/block/trace-events @@ -121,13 +121,6 @@ nvme_ub_db_wr_invalid_cqhead(uint32_t qid, uint16_t new_head) "completion queue nvme_ub_db_wr_invalid_sq(uint32_t qid) "submission queue doorbell write for nonexistent queue, sqid=%"PRIu32", ignoring" nvme_ub_db_wr_invalid_sqtail(uint32_t qid, uint16_t new_tail) "submission queue doorbell write value beyond queue size, sqid=%"PRIu32", new_head=%"PRIu16", ignoring" -# hw/block/xen_disk.c -xen_disk_alloc(char *name) "%s" -xen_disk_init(char *name) "%s" -xen_disk_connect(char *name) "%s" -xen_disk_disconnect(char *name) "%s" -xen_disk_free(char *name) "%s" - # hw/block/xen-block.c xen_block_realize(const char *type, uint32_t disk, uint32_t partition) "%s d%up%u" xen_block_connect(const char *type, uint32_t disk, uint32_t partition) "%s d%up%u" From 95b3c9cfd5eaaa4a2a4afa1eaf09612a94ade1da Mon Sep 17 00:00:00 2001 From: Stefano Garzarella Date: Wed, 30 Jan 2019 10:52:31 +0100 Subject: [PATCH 13/13] virtio-blk: remove duplicate definition of VirtIOBlock *s pointer VirtIOBlock *s is already defined and initialized with req->dev on top of virtio_blk_handle_request(), so we can remove it from the code block of VIRTIO_BLK_T_GET_ID case. Signed-off-by: Stefano Garzarella Reviewed-by: Thomas Huth Message-Id: <20190130095231.42081-1-sgarzare@redhat.com> Signed-off-by: Laurent Vivier --- hw/block/virtio-blk.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index f208c6ddb9..9a87b3bfac 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -569,8 +569,6 @@ static int virtio_blk_handle_request(VirtIOBlockReq *req, MultiReqBuffer *mrb) break; case VIRTIO_BLK_T_GET_ID: { - VirtIOBlock *s = req->dev; - /* * NB: per existing s/n string convention the string is * terminated by '\0' only when shorter than buffer.