| Message ID | 1412185653-18051-1-git-send-email-ehabkost@redhat.com |
|---|---|
| State | New |
| Headers | show |
* Eduardo Habkost (ehabkost@redhat.com) wrote: > The person who created qemu-file.c (me, on commit > 093c455a8c6d8f715eabd8c8d346f08f17d686ec) didn't add a copyright/license > header to the file, even though the whole code was copied from savevm.c > (which had a copyright/license header). > > To correct this, copy the copyright information and license from > savevm.c, that's where the original code came from. > > Luckily, very few changes were made on qemu-file.c after it was created. > All the authors who touched the code are being CCed, so they can confirm > if they are OK with the copyright/license information being added. Since it's come from vl.c that seems to make sense. It should probably go to the stable branch as well, since reading the ~/LICENSE file would make you think it's GPLd. Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > Cc: Dr. David Alan Gilbert <dgilbert@redhat.com> > Cc: Alexey Kardashevskiy <aik@ozlabs.ru> > Cc: Markus Armbruster <armbru@redhat.com> > Cc: Juan Quintela <quintela@redhat.com> > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > --- > qemu-file.c | 23 +++++++++++++++++++++++ > 1 file changed, 23 insertions(+) > > diff --git a/qemu-file.c b/qemu-file.c > index a8e3912..bd5d4af 100644 > --- a/qemu-file.c > +++ b/qemu-file.c > @@ -1,3 +1,26 @@ > +/* > + * QEMU System Emulator > + * > + * Copyright (c) 2003-2008 Fabrice Bellard > + * > + * Permission is hereby granted, free of charge, to any person obtaining a copy > + * of this software and associated documentation files (the "Software"), to deal > + * in the Software without restriction, including without limitation the rights > + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell > + * copies of the Software, and to permit persons to whom the Software is > + * furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice shall be included in > + * all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, > + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > + * THE SOFTWARE. > + */ > #include "qemu-common.h" > #include "qemu/iov.h" > #include "qemu/sockets.h" > -- > 1.9.3 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
On 10/02/2014 03:47 AM, Eduardo Habkost wrote: > The person who created qemu-file.c (me, on commit > 093c455a8c6d8f715eabd8c8d346f08f17d686ec) didn't add a copyright/license > header to the file, even though the whole code was copied from savevm.c > (which had a copyright/license header). > > To correct this, copy the copyright information and license from > savevm.c, that's where the original code came from. > > Luckily, very few changes were made on qemu-file.c after it was created. > All the authors who touched the code are being CCed, so they can confirm > if they are OK with the copyright/license information being added. > > Cc: Dr. David Alan Gilbert <dgilbert@redhat.com> > Cc: Alexey Kardashevskiy <aik@ozlabs.ru> > Cc: Markus Armbruster <armbru@redhat.com> > Cc: Juan Quintela <quintela@redhat.com> > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Acked-by: Alexey Kardashevskiy <aik@ozlabs.ru> > --- > qemu-file.c | 23 +++++++++++++++++++++++ > 1 file changed, 23 insertions(+) > > diff --git a/qemu-file.c b/qemu-file.c > index a8e3912..bd5d4af 100644 > --- a/qemu-file.c > +++ b/qemu-file.c > @@ -1,3 +1,26 @@ > +/* > + * QEMU System Emulator > + * > + * Copyright (c) 2003-2008 Fabrice Bellard > + * > + * Permission is hereby granted, free of charge, to any person obtaining a copy > + * of this software and associated documentation files (the "Software"), to deal > + * in the Software without restriction, including without limitation the rights > + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell > + * copies of the Software, and to permit persons to whom the Software is > + * furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice shall be included in > + * all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, > + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > + * THE SOFTWARE. > + */ > #include "qemu-common.h" > #include "qemu/iov.h" > #include "qemu/sockets.h" >
"Dr. David Alan Gilbert" <dgilbert@redhat.com> writes: > * Eduardo Habkost (ehabkost@redhat.com) wrote: >> The person who created qemu-file.c (me, on commit >> 093c455a8c6d8f715eabd8c8d346f08f17d686ec) didn't add a copyright/license >> header to the file, even though the whole code was copied from savevm.c >> (which had a copyright/license header). >> >> To correct this, copy the copyright information and license from >> savevm.c, that's where the original code came from. >> >> Luckily, very few changes were made on qemu-file.c after it was created. >> All the authors who touched the code are being CCed, so they can confirm >> if they are OK with the copyright/license information being added. > > Since it's come from vl.c that seems to make sense. > It should probably go to the stable branch as well, since reading the ~/LICENSE > file would make you think it's GPLd. > > Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Since we released it that way, licensees could in good faith assume they got it under GPL. My contribution was just a one-liner bug fix. Regardless: Reviewed-by: Markus Armbruster <armbru@redhat.com>
Eduardo Habkost <ehabkost@redhat.com> wrote: > The person who created qemu-file.c (me, on commit > 093c455a8c6d8f715eabd8c8d346f08f17d686ec) didn't add a copyright/license > header to the file, even though the whole code was copied from savevm.c > (which had a copyright/license header). > > To correct this, copy the copyright information and license from > savevm.c, that's where the original code came from. > > Luckily, very few changes were made on qemu-file.c after it was created. > All the authors who touched the code are being CCed, so they can confirm > if they are OK with the copyright/license information being added. > > Cc: Dr. David Alan Gilbert <dgilbert@redhat.com> > Cc: Alexey Kardashevskiy <aik@ozlabs.ru> > Cc: Markus Armbruster <armbru@redhat.com> > Cc: Juan Quintela <quintela@redhat.com> > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Applied
diff --git a/qemu-file.c b/qemu-file.c index a8e3912..bd5d4af 100644 --- a/qemu-file.c +++ b/qemu-file.c @@ -1,3 +1,26 @@ +/* + * QEMU System Emulator + * + * Copyright (c) 2003-2008 Fabrice Bellard + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ #include "qemu-common.h" #include "qemu/iov.h" #include "qemu/sockets.h"
The person who created qemu-file.c (me, on commit 093c455a8c6d8f715eabd8c8d346f08f17d686ec) didn't add a copyright/license header to the file, even though the whole code was copied from savevm.c (which had a copyright/license header). To correct this, copy the copyright information and license from savevm.c, that's where the original code came from. Luckily, very few changes were made on qemu-file.c after it was created. All the authors who touched the code are being CCed, so they can confirm if they are OK with the copyright/license information being added. Cc: Dr. David Alan Gilbert <dgilbert@redhat.com> Cc: Alexey Kardashevskiy <aik@ozlabs.ru> Cc: Markus Armbruster <armbru@redhat.com> Cc: Juan Quintela <quintela@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- qemu-file.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)