| Message ID | 20230918150259.11165-3-Jonathan.Cameron@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/cxl: Misc small fixes | expand |
On Mon, Sep 18, 2023 at 04:02:58PM +0100, Jonathan Cameron wrote: > This has been missing from the start. Assume it should match > with cxl/cxl-component-utils.c as both were part of early > postings from Ben. > > Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- Reviewed-by: Fan Ni <fan.ni@samsung.com> > hw/mem/cxl_type3.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c > index c5855d4e7d..ad3f0f6a9d 100644 > --- a/hw/mem/cxl_type3.c > +++ b/hw/mem/cxl_type3.c > @@ -1,3 +1,12 @@ > +/* > + * CXL Type 3 (memory expander) device > + * > + * Copyright(C) 2020 Intel Corporation. > + * > + * This work is licensed under the terms of the GNU GPL, version 2. See the > + * COPYING file in the top-level directory. > + */ > + > #include "qemu/osdep.h" > #include "qemu/units.h" > #include "qemu/error-report.h" > -- > 2.39.2 >
On Mon, 18 Sept 2023 at 16:04, Jonathan Cameron <Jonathan.Cameron@huawei.com> wrote: > > This has been missing from the start. Assume it should match > with cxl/cxl-component-utils.c as both were part of early > postings from Ben. Sounds plausible -- is there an Intel person who could give us an acked-by for this? (Ideally we wouldn't have let more gpl-2-only code into the codebase without a rationale...) > Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > hw/mem/cxl_type3.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c > index c5855d4e7d..ad3f0f6a9d 100644 > --- a/hw/mem/cxl_type3.c > +++ b/hw/mem/cxl_type3.c > @@ -1,3 +1,12 @@ > +/* > + * CXL Type 3 (memory expander) device > + * > + * Copyright(C) 2020 Intel Corporation. > + * > + * This work is licensed under the terms of the GNU GPL, version 2. See the > + * COPYING file in the top-level directory. > + */ > + > #include "qemu/osdep.h" > #include "qemu/units.h" > #include "qemu/error-report.h" -- PMM
On Mon, 18 Sep 2023 17:31:38 +0100 Peter Maydell <peter.maydell@linaro.org> wrote: > On Mon, 18 Sept 2023 at 16:04, Jonathan Cameron > <Jonathan.Cameron@huawei.com> wrote: > > > > This has been missing from the start. Assume it should match > > with cxl/cxl-component-utils.c as both were part of early > > postings from Ben. > > Sounds plausible -- is there an Intel person who could give us > an acked-by for this? > > (Ideally we wouldn't have let more gpl-2-only code into the > codebase without a rationale...) > I've +CC'd the kernel CXL maintainers from Intel a few of whom have also contributed some of the QEMU CXL code. Hopefully someone can ack. > > Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org> > > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > --- > > hw/mem/cxl_type3.c | 9 +++++++++ > > 1 file changed, 9 insertions(+) > > > > diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c > > index c5855d4e7d..ad3f0f6a9d 100644 > > --- a/hw/mem/cxl_type3.c > > +++ b/hw/mem/cxl_type3.c > > @@ -1,3 +1,12 @@ > > +/* > > + * CXL Type 3 (memory expander) device > > + * > > + * Copyright(C) 2020 Intel Corporation. > > + * > > + * This work is licensed under the terms of the GNU GPL, version 2. See the > > + * COPYING file in the top-level directory. > > + */ > > + > > #include "qemu/osdep.h" > > #include "qemu/units.h" > > #include "qemu/error-report.h" > > -- PMM >
On 9/18/23 10:00, Jonathan Cameron wrote: > On Mon, 18 Sep 2023 17:31:38 +0100 > Peter Maydell <peter.maydell@linaro.org> wrote: > >> On Mon, 18 Sept 2023 at 16:04, Jonathan Cameron >> <Jonathan.Cameron@huawei.com> wrote: >>> >>> This has been missing from the start. Assume it should match >>> with cxl/cxl-component-utils.c as both were part of early >>> postings from Ben. >> >> Sounds plausible -- is there an Intel person who could give us >> an acked-by for this? >> >> (Ideally we wouldn't have let more gpl-2-only code into the >> codebase without a rationale...) >> > > I've +CC'd the kernel CXL maintainers from Intel a few of whom > have also contributed some of the QEMU CXL code. > Hopefully someone can ack. I see that nvdimm.c from Intel is under LGPL 2.1. What is the typical license this should be applied for QEMU? > >>> Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org> >>> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> >>> --- >>> hw/mem/cxl_type3.c | 9 +++++++++ >>> 1 file changed, 9 insertions(+) >>> >>> diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c >>> index c5855d4e7d..ad3f0f6a9d 100644 >>> --- a/hw/mem/cxl_type3.c >>> +++ b/hw/mem/cxl_type3.c >>> @@ -1,3 +1,12 @@ >>> +/* >>> + * CXL Type 3 (memory expander) device >>> + * >>> + * Copyright(C) 2020 Intel Corporation. >>> + * >>> + * This work is licensed under the terms of the GNU GPL, version 2. See the >>> + * COPYING file in the top-level directory. >>> + */ >>> + >>> #include "qemu/osdep.h" >>> #include "qemu/units.h" >>> #include "qemu/error-report.h" >> >> -- PMM >> >
On Mon, 18 Sept 2023 at 18:26, Dave Jiang <dave.jiang@intel.com> wrote: > > > > On 9/18/23 10:00, Jonathan Cameron wrote: > > On Mon, 18 Sep 2023 17:31:38 +0100 > > Peter Maydell <peter.maydell@linaro.org> wrote: > > > >> On Mon, 18 Sept 2023 at 16:04, Jonathan Cameron > >> <Jonathan.Cameron@huawei.com> wrote: > >>> > >>> This has been missing from the start. Assume it should match > >>> with cxl/cxl-component-utils.c as both were part of early > >>> postings from Ben. > >> > >> Sounds plausible -- is there an Intel person who could give us > >> an acked-by for this? > >> > >> (Ideally we wouldn't have let more gpl-2-only code into the > >> codebase without a rationale...) > >> > > > > I've +CC'd the kernel CXL maintainers from Intel a few of whom > > have also contributed some of the QEMU CXL code. > > Hopefully someone can ack. > > I see that nvdimm.c from Intel is under LGPL 2.1. What is the typical license this should be applied for QEMU? The project has a mix of licenses, for mostly historical reasons. The overall license is thus GPLv2 (as the most-restrictive of the set). Our preference (as noted in the top level LICENSE file) for new code is for GPL-v2-or-later; we can take other GPL-2-compatible licenses (preferably GPL-v2-or-later compatible) if there's a good rationale from the submitter. (Historically, one reason for the GPL-v2-only code has been "this came from the Linux kernel and so it's GPL-2-only"; "we copied a lot of this code from some other file in QEMU and that has license X" is the other one.) thanks -- PMM
On 9/18/23 10:00, Jonathan Cameron wrote: > On Mon, 18 Sep 2023 17:31:38 +0100 > Peter Maydell <peter.maydell@linaro.org> wrote: > >> On Mon, 18 Sept 2023 at 16:04, Jonathan Cameron >> <Jonathan.Cameron@huawei.com> wrote: >>> >>> This has been missing from the start. Assume it should match >>> with cxl/cxl-component-utils.c as both were part of early >>> postings from Ben. >> >> Sounds plausible -- is there an Intel person who could give us >> an acked-by for this? >> >> (Ideally we wouldn't have let more gpl-2-only code into the >> codebase without a rationale...) >> > > I've +CC'd the kernel CXL maintainers from Intel a few of whom > have also contributed some of the QEMU CXL code. > Hopefully someone can ack. > >>> Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org> >>> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Acked-by: Dave Jiang <dave.jiang@intel.com> >>> --- >>> hw/mem/cxl_type3.c | 9 +++++++++ >>> 1 file changed, 9 insertions(+) >>> >>> diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c >>> index c5855d4e7d..ad3f0f6a9d 100644 >>> --- a/hw/mem/cxl_type3.c >>> +++ b/hw/mem/cxl_type3.c >>> @@ -1,3 +1,12 @@ >>> +/* >>> + * CXL Type 3 (memory expander) device >>> + * >>> + * Copyright(C) 2020 Intel Corporation. >>> + * >>> + * This work is licensed under the terms of the GNU GPL, version 2. See the >>> + * COPYING file in the top-level directory. >>> + */ >>> + >>> #include "qemu/osdep.h" >>> #include "qemu/units.h" >>> #include "qemu/error-report.h" >> >> -- PMM >> >
Jonathan Cameron wrote: > On Mon, 18 Sep 2023 17:31:38 +0100 > Peter Maydell <peter.maydell@linaro.org> wrote: > > > On Mon, 18 Sept 2023 at 16:04, Jonathan Cameron > > <Jonathan.Cameron@huawei.com> wrote: > > > > > > This has been missing from the start. Assume it should match > > > with cxl/cxl-component-utils.c as both were part of early > > > postings from Ben. > > > > Sounds plausible -- is there an Intel person who could give us > > an acked-by for this? While we are at it; what about .../hw/mem/cxl_type3_stubs.c? > > > > (Ideally we wouldn't have let more gpl-2-only code into the > > codebase without a rationale...) I'm curious about this statement. Does the qemu project not want gpl v2 only code? I agree with Jonathan that this is the intention of Ben's initial submission; so from that PoV. Acked-by: Ira Weiny <ira.weiny@intel.com> Going forward I'd like to better understand the qemu communities view. Thanks, Ira > > > > I've +CC'd the kernel CXL maintainers from Intel a few of whom > have also contributed some of the QEMU CXL code. > Hopefully someone can ack. > > > > Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org> > > > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > > --- > > > hw/mem/cxl_type3.c | 9 +++++++++ > > > 1 file changed, 9 insertions(+) > > > > > > diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c > > > index c5855d4e7d..ad3f0f6a9d 100644 > > > --- a/hw/mem/cxl_type3.c > > > +++ b/hw/mem/cxl_type3.c > > > @@ -1,3 +1,12 @@ > > > +/* > > > + * CXL Type 3 (memory expander) device > > > + * > > > + * Copyright(C) 2020 Intel Corporation. > > > + * > > > + * This work is licensed under the terms of the GNU GPL, version 2. See the > > > + * COPYING file in the top-level directory. > > > + */ > > > + > > > #include "qemu/osdep.h" > > > #include "qemu/units.h" > > > #include "qemu/error-report.h" > > > > -- PMM > > >
On Mon, Sep 18, 2023 at 4:04 PM Jonathan Cameron via <qemu-devel@nongnu.org> wrote: > This has been missing from the start. Assume it should match > with cxl/cxl-component-utils.c as both were part of early > postings from Ben. > > Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > hw/mem/cxl_type3.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c > index c5855d4e7d..ad3f0f6a9d 100644 > --- a/hw/mem/cxl_type3.c > +++ b/hw/mem/cxl_type3.c > @@ -1,3 +1,12 @@ > +/* > + * CXL Type 3 (memory expander) device > + * > + * Copyright(C) 2020 Intel Corporation. > + * > + * This work is licensed under the terms of the GNU GPL, version 2. See > the > + * COPYING file in the top-level directory. > + */ > SPDX-License-Identifier: GPL-v2-only while you're at it (plus a +1 on the other concerns in the thread, though I'll let that play out elsewhere). Warner > + > #include "qemu/osdep.h" > #include "qemu/units.h" > #include "qemu/error-report.h" > -- > 2.39.2 > > >
On Mon, Sep 18, 2023 at 02:14:40PM -0700, Ira Weiny wrote: > Jonathan Cameron wrote: > > On Mon, 18 Sep 2023 17:31:38 +0100 > > Peter Maydell <peter.maydell@linaro.org> wrote: > > > > > On Mon, 18 Sept 2023 at 16:04, Jonathan Cameron > > > <Jonathan.Cameron@huawei.com> wrote: > > > > > > > > This has been missing from the start. Assume it should match > > > > with cxl/cxl-component-utils.c as both were part of early > > > > postings from Ben. > > > > > > Sounds plausible -- is there an Intel person who could give us > > > an acked-by for this? > > While we are at it; what about .../hw/mem/cxl_type3_stubs.c? > > > > > > > (Ideally we wouldn't have let more gpl-2-only code into the > > > codebase without a rationale...) > > I'm curious about this statement. Does the qemu project not want gpl v2 > only code? Correct, this is explicitly stated in the LICENSE file: [quote] As of July 2013, contributions under version 2 of the GNU General Public License (and no later version) are only accepted for the following files or directories: bsd-user/, linux-user/, hw/vfio/, hw/xen/xen_pt*. [/quote] > I agree with Jonathan that this is the intention of Ben's > initial submission; so from that PoV. Ideally we would get all QEMU CXL contributors to agree to re-license to the GPL-2.0-or-later, unless the code has been copied from another project which was GPL-2.0-only thus forcing our code. > > Acked-by: Ira Weiny <ira.weiny@intel.com> > > Going forward I'd like to better understand the qemu communities view. Please follow the LICENSE file which is explicit about QEMU's views per the quoted text above. With regards, Daniel
On Mon, 18 Sep 2023 18:38:10 +0100 Peter Maydell <peter.maydell@linaro.org> wrote: > On Mon, 18 Sept 2023 at 18:26, Dave Jiang <dave.jiang@intel.com> wrote: > > > > > > > > On 9/18/23 10:00, Jonathan Cameron wrote: > > > On Mon, 18 Sep 2023 17:31:38 +0100 > > > Peter Maydell <peter.maydell@linaro.org> wrote: > > > > > >> On Mon, 18 Sept 2023 at 16:04, Jonathan Cameron > > >> <Jonathan.Cameron@huawei.com> wrote: > > >>> > > >>> This has been missing from the start. Assume it should match > > >>> with cxl/cxl-component-utils.c as both were part of early > > >>> postings from Ben. > > >> > > >> Sounds plausible -- is there an Intel person who could give us > > >> an acked-by for this? > > >> > > >> (Ideally we wouldn't have let more gpl-2-only code into the > > >> codebase without a rationale...) > > >> > > > > > > I've +CC'd the kernel CXL maintainers from Intel a few of whom > > > have also contributed some of the QEMU CXL code. > > > Hopefully someone can ack. > > > > I see that nvdimm.c from Intel is under LGPL 2.1. What is the typical license this should be applied for QEMU? > > The project has a mix of licenses, for mostly historical reasons. > The overall license is thus GPLv2 (as the most-restrictive of the set). > Our preference (as noted in the top level LICENSE file) for new > code is for GPL-v2-or-later; we can take other GPL-2-compatible > licenses (preferably GPL-v2-or-later compatible) if there's a > good rationale from the submitter. (Historically, one reason > for the GPL-v2-only code has been "this came from the Linux > kernel and so it's GPL-2-only"; "we copied a lot of this code > from some other file in QEMU and that has license X" is > the other one.) As this one is now 'historical' code I'll stick to the v2 only but make sure anything new goes in with v2 or later unless there is a good reason for another choice. Thanks for the info, Jonathan > > thanks > -- PMM >
On Tue, 19 Sep 2023 09:47:06 +0100 Daniel P. Berrangé <berrange@redhat.com> wrote: > On Mon, Sep 18, 2023 at 02:14:40PM -0700, Ira Weiny wrote: > > Jonathan Cameron wrote: > > > On Mon, 18 Sep 2023 17:31:38 +0100 > > > Peter Maydell <peter.maydell@linaro.org> wrote: > > > > > > > On Mon, 18 Sept 2023 at 16:04, Jonathan Cameron > > > > <Jonathan.Cameron@huawei.com> wrote: > > > > > > > > > > This has been missing from the start. Assume it should match > > > > > with cxl/cxl-component-utils.c as both were part of early > > > > > postings from Ben. > > > > > > > > Sounds plausible -- is there an Intel person who could give us > > > > an acked-by for this? > > > > While we are at it; what about .../hw/mem/cxl_type3_stubs.c? > > > > > > > > > > (Ideally we wouldn't have let more gpl-2-only code into the > > > > codebase without a rationale...) > > > > I'm curious about this statement. Does the qemu project not want gpl v2 > > only code? > > Correct, this is explicitly stated in the LICENSE file: > > [quote] > As of July 2013, contributions under version 2 of the GNU General Public > License (and no later version) are only accepted for the following files > or directories: bsd-user/, linux-user/, hw/vfio/, hw/xen/xen_pt*. > [/quote] > > > I agree with Jonathan that this is the intention of Ben's > > initial submission; so from that PoV. > > Ideally we would get all QEMU CXL contributors to agree to re-license > to the GPL-2.0-or-later, unless the code has been copied from another > project which was GPL-2.0-only thus forcing our code. > > > > > Acked-by: Ira Weiny <ira.weiny@intel.com> > > > > Going forward I'd like to better understand the qemu communities view. > > Please follow the LICENSE file which is explicit about QEMU's views > per the quoted text above. I'd be fine with relaxing these, but there are quite a few contributors so it will be a little difficult to establish. Given, for that to be useful we need to do all the CXL files, I'll post a v2 of this series setting this to GPL-v2-only and we can see if we can address relicencing at a later date. > > With regards, > Daniel
diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c index c5855d4e7d..ad3f0f6a9d 100644 --- a/hw/mem/cxl_type3.c +++ b/hw/mem/cxl_type3.c @@ -1,3 +1,12 @@ +/* + * CXL Type 3 (memory expander) device + * + * Copyright(C) 2020 Intel Corporation. + * + * This work is licensed under the terms of the GNU GPL, version 2. See the + * COPYING file in the top-level directory. + */ + #include "qemu/osdep.h" #include "qemu/units.h" #include "qemu/error-report.h"
This has been missing from the start. Assume it should match with cxl/cxl-component-utils.c as both were part of early postings from Ben. Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> --- hw/mem/cxl_type3.c | 9 +++++++++ 1 file changed, 9 insertions(+)