| Message ID | 1339076735-19796-1-git-send-email-sw@weilnetz.de |
|---|---|
| State | Accepted |
| Headers | show |
Thanks, applied. On Thu, Jun 7, 2012 at 1:45 PM, Stefan Weil <sw@weilnetz.de> wrote: > dump.c was recently added to the code. It unconditionally > includes sys/procfs which is not available with MinGW (w32, w64). > > It looks like this file is not needed at all (tested on Linux), > so I removed it completely. > > Some other include statements are also redundant because they are > already included in qemu-common, therefore they were removed, too. > > Signed-off-by: Stefan Weil <sw@weilnetz.de> > --- > > dump.* use GPL2 instead of GPL2+. Please fix that! > > Regards, > Stefan Weil > > > dump.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/dump.c b/dump.c > index 0ca14f8..f44ce47 100644 > --- a/dump.c > +++ b/dump.c > @@ -12,10 +12,7 @@ > */ > > #include "qemu-common.h" > -#include <unistd.h> > #include "elf.h" > -#include <sys/procfs.h> > -#include <glib.h> > #include "cpu.h" > #include "cpu-all.h" > #include "targphys.h" > @@ -23,7 +20,6 @@ > #include "kvm.h" > #include "dump.h" > #include "sysemu.h" > -#include "bswap.h" > #include "memory_mapping.h" > #include "error.h" > #include "qmp-commands.h" > -- > 1.7.10 > >
At 06/07/2012 09:45 PM, Stefan Weil Wrote: > dump.c was recently added to the code. It unconditionally > includes sys/procfs which is not available with MinGW (w32, w64). > > It looks like this file is not needed at all (tested on Linux), > so I removed it completely. > > Some other include statements are also redundant because they are > already included in qemu-common, therefore they were removed, too. > > Signed-off-by: Stefan Weil <sw@weilnetz.de> Thanks for your fix. It is OK to me. Wen Congyang > --- > > dump.* use GPL2 instead of GPL2+. Please fix that! > > Regards, > Stefan Weil > > > dump.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/dump.c b/dump.c > index 0ca14f8..f44ce47 100644 > --- a/dump.c > +++ b/dump.c > @@ -12,10 +12,7 @@ > */ > > #include "qemu-common.h" > -#include <unistd.h> > #include "elf.h" > -#include <sys/procfs.h> > -#include <glib.h> > #include "cpu.h" > #include "cpu-all.h" > #include "targphys.h" > @@ -23,7 +20,6 @@ > #include "kvm.h" > #include "dump.h" > #include "sysemu.h" > -#include "bswap.h" > #include "memory_mapping.h" > #include "error.h" > #include "qmp-commands.h"
Il 11/06/2012 03:57, Wen Congyang ha scritto:
>> dump.* use GPL2 instead of GPL2+. Please fix that!
Wen, do you have permissions to release your new files under GPLv2 or later?
Paolo
Paolo Bonzini <pbonzini@redhat.com> writes: > Il 11/06/2012 03:57, Wen Congyang ha scritto: >>> dump.* use GPL2 instead of GPL2+. Please fix that! > > Wen, do you have permissions to release your new files under GPLv2 or later? Don't we require GPLv2+ for all contributions now? If not, we should.
On 6/12/12, Markus Armbruster <armbru@redhat.com> wrote: > Paolo Bonzini <pbonzini@redhat.com> writes: > >> Il 11/06/2012 03:57, Wen Congyang ha scritto: >>>> dump.* use GPL2 instead of GPL2+. Please fix that! >> >> Wen, do you have permissions to release your new files under GPLv2 or >> later? > > Don't we require GPLv2+ for all contributions now? If not, we should. > I think it's not possible for all contributions. The BSD-like license can not be removed from a file once it's there. So, the contributions made to such file do inherit this license, unless they have other license written directly in the source code. (This is btw, why you still have to fix the license violation [1,2] happened in 2010). Moreover, there are explicit places in QEMU source tree [3] which say BSD-like is the only acceptable license. Artyom 1. http://lists.gnu.org/archive/html/qemu-devel/2010-12/msg01228.html 2. http://lists.gnu.org/archive/html/qemu-devel/2012-05/msg02408.html 3. http://git.qemu.org/?p=qemu.git;a=blob_plain;f=tcg/LICENSE;hb=master
Am 16.06.2012 20:07, schrieb Artyom Tarasenko: > On 6/12/12, Markus Armbruster <armbru@redhat.com> wrote: >> Paolo Bonzini <pbonzini@redhat.com> writes: >> >>> Il 11/06/2012 03:57, Wen Congyang ha scritto: >>>>> dump.* use GPL2 instead of GPL2+. Please fix that! >>> >>> Wen, do you have permissions to release your new files under GPLv2 or >>> later? >> >> Don't we require GPLv2+ for all contributions now? If not, we should. >> > > I think it's not possible for all contributions. [snip] You're reading this out of context. It's about GPLv2 vs. GPLv2+, not about GPL vs. BSD/MIT/... Andreas
On Sat, Jun 16, 2012 at 8:31 PM, Andreas Färber <afaerber@suse.de> wrote: > Am 16.06.2012 20:07, schrieb Artyom Tarasenko: >> On 6/12/12, Markus Armbruster <armbru@redhat.com> wrote: >>> Paolo Bonzini <pbonzini@redhat.com> writes: >>> >>>> Il 11/06/2012 03:57, Wen Congyang ha scritto: >>>>>> dump.* use GPL2 instead of GPL2+. Please fix that! >>>> >>>> Wen, do you have permissions to release your new files under GPLv2 or >>>> later? >>> >>> Don't we require GPLv2+ for all contributions now? If not, we should. >>> >> >> I think it's not possible for all contributions. > [snip] > > You're reading this out of context. It's about GPLv2 vs. GPLv2+, not > about GPL vs. BSD/MIT/... But still, it's not possible for all contributions, right? To sum this up: GPL v2+ are allowed non-GPL contributions are allowed GPL v2- are not allowed. Am I missing something? Artyom > Andreas > > > -- > SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany > GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Il 16/06/2012 20:48, Artyom Tarasenko ha scritto: > But still, it's not possible for all contributions, right? > > To sum this up: > GPL v2+ are allowed > non-GPL contributions are allowed Yes, as long as they are GPLv2- and v3-compatible. So for example no Apache license (just a theoretical case, but worth mentioning for completeness), because it's not GPLv2-compatible. I'm not aware of any license that is GPLv2-compatible but not GPLv3, but there must be one hiding somewhere. :) Paolo > GPL v2- are not allowed.
On Sun, Jul 1, 2012 at 2:26 PM, Paolo Bonzini <pbonzini@redhat.com> wrote: > Il 16/06/2012 20:48, Artyom Tarasenko ha scritto: >> But still, it's not possible for all contributions, right? >> >> To sum this up: >> GPL v2+ are allowed >> non-GPL contributions are allowed > > Yes, as long as they are GPLv2- and v3-compatible. So for example no > Apache license (just a theoretical case, but worth mentioning for > completeness), because it's not GPLv2-compatible. > > I'm not aware of any license that is GPLv2-compatible but not GPLv3, but > there must be one hiding somewhere. :) GPLv2only? :) > > Paolo > >> GPL v2- are not allowed. > > > >
diff --git a/dump.c b/dump.c index 0ca14f8..f44ce47 100644 --- a/dump.c +++ b/dump.c @@ -12,10 +12,7 @@ */ #include "qemu-common.h" -#include <unistd.h> #include "elf.h" -#include <sys/procfs.h> -#include <glib.h> #include "cpu.h" #include "cpu-all.h" #include "targphys.h" @@ -23,7 +20,6 @@ #include "kvm.h" #include "dump.h" #include "sysemu.h" -#include "bswap.h" #include "memory_mapping.h" #include "error.h" #include "qmp-commands.h"
dump.c was recently added to the code. It unconditionally includes sys/procfs which is not available with MinGW (w32, w64). It looks like this file is not needed at all (tested on Linux), so I removed it completely. Some other include statements are also redundant because they are already included in qemu-common, therefore they were removed, too. Signed-off-by: Stefan Weil <sw@weilnetz.de> --- dump.* use GPL2 instead of GPL2+. Please fix that! Regards, Stefan Weil dump.c | 4 ---- 1 file changed, 4 deletions(-)