Question about licensing of linked inmates

51 views

Skip to first unread message

Claudio Scordino

unread,

Mar 21, 2017, 5:27:43 AM3/21/17

to Jailhouse

Dear all,

I apologize if this topic has been already discussed in list.

I've noted that the inmate lib is licensed under GPL. Therefore, if I'm not wrong, its license also affects the inmate binaries that get linked to it.

If licensing the hypervisor code under GPL is reasonable for a plethora of reasons, I wonder if applying the same license for the inmate library is wise or not, since it may prevent the usage of such library in an industrial context where the inmate code must remain proprietary.

Best regards,

Claudio

Jan Kiszka

unread,

Mar 21, 2017, 6:00:16 AM3/21/17

to Claudio Scordino, Jailhouse

Correct, the inmate library in its current form is not suitable for
proprietary inmate development. We only licensed interface header of the
hypervisor under dual GPL/BSD, not the library.

I wouldn't refuse a relicensing proposal if there is a real need and
someone has the time to drive it (hunt down all copyright holders), but
I would also like to have a discussion about technical alternatives
first, i.e. RTOSes that already come with permissive licenses. I
consider Zephyr as the hottest candidate for this right now (x86
support, consistent licensing, vivid and growing industrial community).

The library may still play a role in future when we start adding more
test cases.

Jan

--
Siemens AG, Corporate Technology, CT RDA ITP SES-DE
Corporate Competence Center Embedded Linux

Claudio Scordino

unread,

Mar 21, 2017, 7:12:30 AM3/21/17

to Jan Kiszka, Jailhouse

Dear Jan,

thank you for clarifying. Let's see how the topic evolves.

In case, the easiest path could be the addition of the linking exception clause (https://en.wikipedia.org/wiki/GPL_linking_exception) to the plain GPL just for the inmate library.

Best regards,

Claudio

Claudio Scordino, Ph.D.

Project Manager - Funded research projects

Evidence Srl
Via Carducci 56
56010 S.Giuliano Terme - Pisa - Italy

Phone: +39 050 99 11 224

Mobile: + 39 393 811 7491

Fax: +39 050 99 10 812
http://www.evidence.eu.com

Valentine Sinitsyn

unread,

Mar 21, 2017, 7:23:32 AM3/21/17

to Claudio Scordino, Jan Kiszka, Jailhouse

Hi Claudio,

On 21.03.2017 14:12, Claudio Scordino wrote:
> Dear Jan,
>
> thank you for clarifying. Let's see how the topic evolves.
>
> In case, the easiest path could be the addition of the linking exception
> clause (https://en.wikipedia.org/wiki/GPL_linking_exception) to the
> plain GPL just for the inmate library.

AFAIR this still means reaching all the copyright holders and making
them agree to the change. Otherwise, it's an option.

Valentine

>
> Best regards,
>
> Claudio
>
> 2017-03-21 11:00 GMT+01:00 Jan Kiszka <jan.k...@siemens.com

> <mailto:jan.k...@siemens.com>>:

> http://www.evidence.eu.com <http://www.evidence.eu.com/>
>
> --
> You received this message because you are subscribed to the Google
> Groups "Jailhouse" group.
> To unsubscribe from this group and stop receiving emails from it, send
> an email to jailhouse-de...@googlegroups.com
> <mailto:jailhouse-de...@googlegroups.com>.
> For more options, visit https://groups.google.com/d/optout.

Claudio Scordino

unread,

Mar 21, 2017, 7:27:24 AM3/21/17

to Valentine Sinitsyn, Jan Kiszka, Jailhouse

Hi Valentine,

2017-03-21 12:23 GMT+01:00 Valentine Sinitsyn <valentine...@gmail.com>:

Hi Claudio,

On 21.03.2017 14:12, Claudio Scordino wrote:

Dear Jan,

thank you for clarifying. Let's see how the topic evolves.

In case, the easiest path could be the addition of the linking exception
clause (https://en.wikipedia.org/wiki/GPL_linking_exception) to the
plain GPL just for the inmate library.

AFAIR this still means reaching all the copyright holders and making them agree to the change. Otherwise, it's an option.

Of course: whatever change will need the permission from the copyright holders.

I just meant that adding a clause to the current license could be easier than adopting a completely different license just for such library.

Sorry for the misunderstanding.

Best regards,

Claudio

Jan Kiszka

unread,

Mar 21, 2017, 8:34:00 AM3/21/17

to Claudio Scordino, Valentine Sinitsyn, Jailhouse

On 2017-03-21 12:27, Claudio Scordino wrote:
> Hi Valentine,
>
> 2017-03-21 12:23 GMT+01:00 Valentine Sinitsyn

> <valentine...@gmail.com <mailto:valentine...@gmail.com>>:

>
> Hi Claudio,
>
> On 21.03.2017 14:12, Claudio Scordino wrote:
>
> Dear Jan,
>
> thank you for clarifying. Let's see how the topic evolves.
>
> In case, the easiest path could be the addition of the linking
> exception
> clause (https://en.wikipedia.org/wiki/GPL_linking_exception

> <https://en.wikipedia.org/wiki/GPL_linking_exception>) to the

> plain GPL just for the inmate library.
>
> AFAIR this still means reaching all the copyright holders and making
> them agree to the change. Otherwise, it's an option.
>
>
> Of course: whatever change will need the permission from the copyright
> holders.
> I just meant that adding a clause to the current license could be easier
> than adopting a completely different license just for such library.
> Sorry for the misunderstanding.

The trickier part is usually getting a reply from all contributors. If
the license change is consistent and not too "creative", it will be the
smaller challenge.

Claudio Scordino

unread,

Jun 8, 2017, 11:38:15 AM6/8/17

to Jan Kiszka, Jailhouse

Hi Jan,

2017-03-21 11:00 GMT+01:00 Jan Kiszka <jan.k...@siemens.com>:

On 2017-03-21 10:27, Claudio Scordino wrote:
> Dear all,
>
> I apologize if this topic has been already discussed in list.
>
> I've noted that the inmate lib is licensed under GPL. Therefore, if I'm
> not wrong, its license also affects the inmate binaries that get linked
> to it.
>
> If licensing the hypervisor code under GPL is reasonable for a plethora
> of reasons, I wonder if applying the same license for the inmate library
> is wise or not, since it may prevent the usage of such library in an
> industrial context where the inmate code must remain proprietary.

Correct, the inmate library in its current form is not suitable for
proprietary inmate development. We only licensed interface header of the
hypervisor under dual GPL/BSD, not the library.

I wouldn't refuse a relicensing proposal if there is a real need and
someone has the time to drive it (hunt down all copyright holders), but
I would also like to have a discussion about technical alternatives
first, i.e. RTOSes that already come with permissive licenses. I
consider Zephyr as the hottest candidate for this right now (x86
support, consistent licensing, vivid and growing industrial community).

Actually, I see the problem more related to the application code (often kept proprietary) rather than to the RTOS itself.

Even without a RTOS, in fact, the problem persists for proprietary bare-metal applications.

Some RTOSs (e.g., ERIKA Enterprise) are open-source, but come with a permissive license allowing static linking of proprieraty application code.

"git log" extracted 14 contributors for the inmate/lib/ code.

If you agree, I can try to contact those developers asking for a preliminary feedback.

As a company, we definitely need a license allowing static linking of proprietary bare-metal code against the inmate library.

The license can be similar to the one used by the ERIKA RTOS (i.e. GPL + linking exception - https://en.wikipedia.org/wiki/GPL_linking_exception) or an even more permessive license (e.g., BSD, MIT).

Best regards,

Claudio

Jan Kiszka

unread,

Jun 8, 2017, 12:35:26 PM6/8/17

to Claudio Scordino, Jailhouse

On 2017-06-08 17:38, Claudio Scordino wrote:
> Hi Jan,
>
> 2017-03-21 11:00 GMT+01:00 Jan Kiszka <jan.k...@siemens.com

> <mailto:jan.k...@siemens.com>>:

From my POV, GPL + linking exception would be the best to go when we
really want to lift the inmates on that level. But I would have to check
internally with our authorities anyway.

We are currently evaluating Zephyr on Jailhouse, but that is still in a
too early stage to contribute to this discussion or even a decision. How
urgent is the topic for you?

Gustavo Lima Chaves

unread,

Jun 8, 2017, 12:48:51 PM6/8/17

to Jan Kiszka, Claudio Scordino, Jailhouse

* Jan Kiszka <jan.k...@siemens.com> [2017-06-08 18:35:22 +0200]:

How far are you into Zephyr? I have patches doing a preliminar port, so that
at least UART and LOAPIC timers are working from Zephyr just fine:

"""
Created cell "tiny-demo"
Page pool usage after cell creation: mem 275/1480, remap 65607/131072
Cell "tiny-demo" can be loaded
CPU 3 received SIPI, vector 100
Started cell "tiny-demo"
***** BOOTING ZEPHYR OS v1.7.99 - BUILD: Jun 8 2017 00:36:18 *****
Hello World!
Hello World!
Hello World!
"""

This code lies on my hard disk only, for now, but sure I want to make
it upstream, if both parties agree on its usefulness (Zephyr and
Jailhouse). From a licensing POV, I just used a bare minimal excerpt
from header-32.S, and would indeed be great to have that code more
permissive, so that I would not have to bother re-writing it myself.

One thing I lost from not using the inmate lib was xAPIC access to the
LOAPIC, so my preliminar patch does rewrite those accesses to be
x2APIC (MSR-based).

Cheers,

>
> Jan
>
> --
> Siemens AG, Corporate Technology, CT RDA ITP SES-DE
> Corporate Competence Center Embedded Linux
>

> --
> You received this message because you are subscribed to the Google Groups "Jailhouse" group.

> To unsubscribe from this group and stop receiving emails from it, send an email to jailhouse-de...@googlegroups.com.

> For more options, visit https://groups.google.com/d/optout.

--
Gustavo Lima Chaves
Intel - Open Source Technology Center

Jan Kiszka

unread,

Jun 8, 2017, 1:13:24 PM6/8/17

to Gustavo Lima Chaves, Claudio Scordino, Jailhouse, Andreas Rollbühler

On 2017-06-08 18:48, Gustavo Lima Chaves wrote:
>> We are currently evaluating Zephyr on Jailhouse, but that is still in a
>> too early stage to contribute to this discussion or even a decision. How
>> urgent is the topic for you?
>
> How far are you into Zephyr? I have patches doing a preliminar port, so that
> at least UART and LOAPIC timers are working from Zephyr just fine:
>
> """
> Created cell "tiny-demo"
> Page pool usage after cell creation: mem 275/1480, remap 65607/131072
> Cell "tiny-demo" can be loaded
> CPU 3 received SIPI, vector 100
> Started cell "tiny-demo"
> ***** BOOTING ZEPHYR OS v1.7.99 - BUILD: Jun 8 2017 00:36:18 *****
> Hello World!
> Hello World!
> Hello World!
> """
>

Hoho, good that I dropped this note - great to see this!

I added Andreas to CC who is just starting off, maybe still a bit wet
from the first bucket of cold Jailhouse water.

> This code lies on my hard disk only, for now, but sure I want to make
> it upstream, if both parties agree on its usefulness (Zephyr and
> Jailhouse). From a licensing POV, I just used a bare minimal excerpt
> from header-32.S, and would indeed be great to have that code more
> permissive, so that I would not have to bother re-writing it myself.

Individual files would be easier to relicense, header-32.S is only owned
by us e.g.

>
> One thing I lost from not using the inmate lib was xAPIC access to the
> LOAPIC, so my preliminar patch does rewrite those accesses to be
> x2APIC (MSR-based).

x2APIC is the better choice.

But back to the topic, and actually there are two: writing applications
on top of a permissive runtime - inmates lib or a permissively licensed
RTOS - and providing reusable material to porting RTOSes over Jailhouse.
When doing a relicensing, the motivation and intended usage should be
clearly defined before approaching all the copyright holders. And we
should then also think about how to (re-)structure the code when we want
to support the second case.

How much could Zephyr be configured down in order to become something
like the inmates lib? In fact, if it can server all existing purposes -
simple tests, benchmarks, demos - and be scaled up to a real application
platform, I would like to avoid doing work twice. Then our focus should
be enabling Jailhouse for Zephyr on all our supported archs.

Gustavo Lima Chaves

unread,

Jun 8, 2017, 1:27:32 PM6/8/17

to Jan Kiszka, Claudio Scordino, Jailhouse, Andreas Rollbühler

* Jan Kiszka <jan.k...@siemens.com> [2017-06-08 19:13:20 +0200]:

> On 2017-06-08 18:48, Gustavo Lima Chaves wrote:
> >> We are currently evaluating Zephyr on Jailhouse, but that is still in a
> >> too early stage to contribute to this discussion or even a decision. How
> >> urgent is the topic for you?
> >
> > How far are you into Zephyr? I have patches doing a preliminar port, so that
> > at least UART and LOAPIC timers are working from Zephyr just fine:
> >
> > """
> > Created cell "tiny-demo"
> > Page pool usage after cell creation: mem 275/1480, remap 65607/131072
> > Cell "tiny-demo" can be loaded
> > CPU 3 received SIPI, vector 100
> > Started cell "tiny-demo"
> > ***** BOOTING ZEPHYR OS v1.7.99 - BUILD: Jun 8 2017 00:36:18 *****
> > Hello World!
> > Hello World!
> > Hello World!
> > """
> >
>
> Hoho, good that I dropped this note - great to see this!
>
> I added Andreas to CC who is just starting off, maybe still a bit wet
> from the first bucket of cold Jailhouse water.

>
> > This code lies on my hard disk only, for now, but sure I want to make
> > it upstream, if both parties agree on its usefulness (Zephyr and
> > Jailhouse). From a licensing POV, I just used a bare minimal excerpt
> > from header-32.S, and would indeed be great to have that code more
> > permissive, so that I would not have to bother re-writing it myself.
>
> Individual files would be easier to relicense, header-32.S is only owned
> by us e.g.

Cool.

>
> >
> > One thing I lost from not using the inmate lib was xAPIC access to the
> > LOAPIC, so my preliminar patch does rewrite those accesses to be
> > x2APIC (MSR-based).
>
> x2APIC is the better choice.

Yeah, maybe, but the ifdefs on my patch are looking uglish (they might
want to keep the xAPIC access for the MCUs, I'm afraid).

>
> But back to the topic, and actually there are two: writing applications
> on top of a permissive runtime - inmates lib or a permissively licensed
> RTOS - and providing reusable material to porting RTOSes over Jailhouse.

Sure, the second approach is exactly what we'd have with my patches
(and possible right after header-32.S is good WRT licensing).

> When doing a relicensing, the motivation and intended usage should be
> clearly defined before approaching all the copyright holders. And we
> should then also think about how to (re-)structure the code when we want
> to support the second case.

Yeah. The 1st approach is very valid for me as well, and you got a
supporter here too for making its license different than of the rest
of the codebase.

>
> How much could Zephyr be configured down in order to become something
> like the inmates lib? In fact, if it can server all existing purposes -
> simple tests, benchmarks, demos - and be scaled up to a real application
> platform, I would like to avoid doing work twice. Then our focus should
> be enabling Jailhouse for Zephyr on all our supported archs.

Like I said, it's already happening. I like that we're aligned, let me
make sure the patch is massaged enough to propose upstream soonish.

One thing to have in mind, though, is that Zephyr is originally a
system targeted at MCUs, so we'll encounter things like hardcoded
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC (MCUs don't seem to have CPU
throttling) and stuff like that—I still haven't found a value for it
on my test to exactly match a 1 second timer on this corei17, hehe.

>
> Jan
>
> --
> Siemens AG, Corporate Technology, CT RDA ITP SES-DE
> Corporate Competence Center Embedded Linux
>

Jan Kiszka

unread,

Jun 8, 2017, 2:24:30 PM6/8/17

to Gustavo Lima Chaves, Claudio Scordino, Jailhouse, Andreas Rollbühler

Sure, for bare-metal you likely need this (the Quark has no x2APIC, not
even the big, I bet :).

>
>>
>> But back to the topic, and actually there are two: writing applications
>> on top of a permissive runtime - inmates lib or a permissively licensed
>> RTOS - and providing reusable material to porting RTOSes over Jailhouse.
>
> Sure, the second approach is exactly what we'd have with my patches
> (and possible right after header-32.S is good WRT licensing).
>
>> When doing a relicensing, the motivation and intended usage should be
>> clearly defined before approaching all the copyright holders. And we
>> should then also think about how to (re-)structure the code when we want
>> to support the second case.
>
> Yeah. The 1st approach is very valid for me as well, and you got a
> supporter here too for making its license different than of the rest
> of the codebase.
>

OK, let's get serious: Claudio, you offered to go after the copyright
holders. Could you prepare a reasoning email for the license change and
a patch to perform it? That could be sent to those folks, collect their
acks, and I could also use it for starting the process internally to add
ours.

Given the use case "for integration in non-GPL RTOSes", it would likely
be better to go for a dual BSD-2-Clause/GPLv2, just like we already did
with headers. Would this be fine for Zephyr as well?

>>
>> How much could Zephyr be configured down in order to become something
>> like the inmates lib? In fact, if it can server all existing purposes -
>> simple tests, benchmarks, demos - and be scaled up to a real application
>> platform, I would like to avoid doing work twice. Then our focus should
>> be enabling Jailhouse for Zephyr on all our supported archs.
>
> Like I said, it's already happening. I like that we're aligned, let me
> make sure the patch is massaged enough to propose upstream soonish.

Great! Once you can share anything in any form, even when not yet for
upstream, please let us know. There is strong interest here.

>
> One thing to have in mind, though, is that Zephyr is originally a
> system targeted at MCUs, so we'll encounter things like hardcoded
> CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC (MCUs don't seem to have CPU
> throttling) and stuff like that—I still haven't found a value for it
> on my test to exactly match a 1 second timer on this corei17, hehe.

Don't you have infrastructure for device tree on ARM or beyond already?
I suppose this is not yet enabled on x86, but it would be doable and
conceptually clean. I was briefly discussing this issue with Andreas
already as well.

Gustavo Lima Chaves

unread,

Jun 8, 2017, 3:49:02 PM6/8/17

to Jan Kiszka, Claudio Scordino, Jailhouse, Andreas Rollbühler

* Jan Kiszka <jan.k...@siemens.com> [2017-06-08 20:24:23 +0200]:

> On 2017-06-08 19:27, Gustavo Lima Chaves wrote:
> > * Jan Kiszka <jan.k...@siemens.com> [2017-06-08 19:13:20 +0200]:
> >
> >>
> >>>

> >>> One thing I lost from not using the inmate lib was xAPIC access to the
> >>> LOAPIC, so my preliminar patch does rewrite those accesses to be
> >>> x2APIC (MSR-based).
> >>
> >> x2APIC is the better choice.
> >
> > Yeah, maybe, but the ifdefs on my patch are looking uglish (they might
> > want to keep the xAPIC access for the MCUs, I'm afraid).
>
> Sure, for bare-metal you likely need this (the Quark has no x2APIC, not
> even the big, I bet :).

Ack.

> >
> > Yeah. The 1st approach is very valid for me as well, and you got a
> > supporter here too for making its license different than of the rest
> > of the codebase.
> >
>
> OK, let's get serious: Claudio, you offered to go after the copyright
> holders. Could you prepare a reasoning email for the license change and
> a patch to perform it? That could be sent to those folks, collect their
> acks, and I could also use it for starting the process internally to add
> ours.
>
> Given the use case "for integration in non-GPL RTOSes", it would likely
> be better to go for a dual BSD-2-Clause/GPLv2, just like we already did
> with headers. Would this be fine for Zephyr as well?

I think so. Zephyr is Apache 2—it seems it's a new trend at least for
some, due to patent clauses, etc, etc (IANAL)—but I'd guess they're
compatible.

>
> >>
> >> How much could Zephyr be configured down in order to become something
> >> like the inmates lib? In fact, if it can server all existing purposes -
> >> simple tests, benchmarks, demos - and be scaled up to a real application
> >> platform, I would like to avoid doing work twice. Then our focus should
> >> be enabling Jailhouse for Zephyr on all our supported archs.
> >
> > Like I said, it's already happening. I like that we're aligned, let me
> > make sure the patch is massaged enough to propose upstream soonish.
>
> Great! Once you can share anything in any form, even when not yet for
> upstream, please let us know. There is strong interest here.

OK, I'll sure let you know.

>
> >
> > One thing to have in mind, though, is that Zephyr is originally a
> > system targeted at MCUs, so we'll encounter things like hardcoded
> > CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC (MCUs don't seem to have CPU
> > throttling) and stuff like that—I still haven't found a value for it
> > on my test to exactly match a 1 second timer on this corei17, hehe.
>
> Don't you have infrastructure for device tree on ARM or beyond already?
> I suppose this is not yet enabled on x86, but it would be doable and
> conceptually clean. I was briefly discussing this issue with Andreas
> already as well.

I'm not touching ARM, no idea. If it's possible on x86, then great,
folks we accept patches fine for that. Not a thing that know much,
though.

>
> Jan
>
> --
> Siemens AG, Corporate Technology, CT RDA ITP SES-DE
> Corporate Competence Center Embedded Linux
>

Claudio Scordino

unread,

Jun 12, 2017, 4:10:53 AM6/12/17

to Jan Kiszka, Gustavo Lima Chaves, Jailhouse, Andreas Rollbühler

Dear guys,

Pasted below. Let me get your feedback.

Many thanks and best regards,

Claudio

========================================

Subject: Request for relicensing your contribution to Jailhouse

Dear developer,

your name is listed among the authors of the source code within the
inmates/lib/ directory of Jailhouse, and therefore you are among the copyright
holders of a part of such library.

The library is currently licensed under GPL, meaning that it cannot be linked
to proprietary code unless by releasing such code under GPL. This prevents the
usage of the hypervisor in all industrial contexts where the inmate code cannot
be disclosed. For this reason, the jailhouse community is currently discussing
[1] the possibility/opportunity of changing the license of just the inmate
library to one allowing static linking of proprietary code (e.g., GPL+linking
exception [2]). The license of the hypervisor and of the Linux driver will
remain untouched.

A relicensing of the source code needs the unanimous consent of all the
copyright holders of the library. A proposal of change is therefore pasted
below. I kindly ask you to tell me if you officially consent to such change.

Don't hesitate to contact me in case you need any further clarification.

Many thanks for your time and your contribution. Best regards.

Claudio

[1] https://groups.google.com/forum/#!topic/jailhouse-dev/eskAY0BGhWc
[2] https://en.wikipedia.org/wiki/GPL_linking_exception

========================================

From 93831ca738a0a412fe5a69e37c4d7101632ff907 Mon Sep 17 00:00:00 2001
From: Claudio Scordino <cla...@evidence.eu.com>
Date: Mon, 12 Jun 2017 09:35:11 +0200
Subject: [PATCH] License change for the inmate library.

Signed-off-by: Claudio Scordino <cla...@evidence.eu.com>
---
LICENSING.md | 4 ++++
inmates/lib/COPYING | 18 ++++++++++++++++++
inmates/lib/arm-common/Makefile.lib | 6 +++---
inmates/lib/arm-common/gic-v2.c | 5 +++--
inmates/lib/arm-common/gic.c | 5 +++--
inmates/lib/arm-common/include/gic.h | 5 +++--
inmates/lib/arm-common/include/inmate.h | 5 +++--
inmates/lib/arm-common/include/uart.h | 5 +++--
inmates/lib/arm-common/printk.c | 5 +++--
inmates/lib/arm-common/timer.c | 5 +++--
inmates/lib/arm-common/uart-8250.c | 5 +++--
inmates/lib/arm-common/uart-jailhouse.c | 5 +++--
inmates/lib/arm-common/uart-pl011.c | 5 +++--
inmates/lib/arm-common/uart-xuartps.c | 5 +++--
inmates/lib/arm/Makefile | 5 +++--
inmates/lib/arm/Makefile.lib | 5 +++--
inmates/lib/arm/gic-v3.c | 5 +++--
inmates/lib/arm/header.S | 5 +++--
inmates/lib/arm/include/arch/gic.h | 5 +++--
inmates/lib/arm/include/arch/inmate.h | 5 +++--
inmates/lib/arm/include/mach.h | 5 +++--
inmates/lib/arm/inmate.lds.S | 5 +++--
inmates/lib/arm64/Makefile | 5 +++--
inmates/lib/arm64/Makefile.lib | 5 +++--
inmates/lib/arm64/header.S | 5 +++--
inmates/lib/arm64/include/arch/gic.h | 5 +++--
inmates/lib/arm64/include/arch/inmate.h | 5 +++--
inmates/lib/arm64/include/mach.h | 5 +++--
inmates/lib/arm64/inmate.lds.S | 5 +++--
inmates/lib/cmdline.c | 5 +++--
inmates/lib/inmate_common.h | 5 +++--
inmates/lib/pci.c | 5 +++--
inmates/lib/string.c | 5 +++--
inmates/lib/x86/Makefile | 5 +++--
inmates/lib/x86/Makefile.lib | 5 +++--
inmates/lib/x86/header-32.S | 5 +++--
inmates/lib/x86/header.S | 5 +++--
inmates/lib/x86/hypercall.c | 5 +++--
inmates/lib/x86/inmate.h | 5 +++--
inmates/lib/x86/inmate.lds | 5 +++--
inmates/lib/x86/int.c | 5 +++--
inmates/lib/x86/ioapic.c | 5 +++--
inmates/lib/x86/mem.c | 5 +++--
inmates/lib/x86/pci.c | 5 +++--
inmates/lib/x86/printk.c | 5 +++--
inmates/lib/x86/smp.c | 5 +++--
inmates/lib/x86/timing.c | 5 +++--
47 files changed, 157 insertions(+), 91 deletions(-)
create mode 100644 inmates/lib/COPYING

diff --git a/LICENSING.md b/LICENSING.md
index 682635c..7ddc88b 100644
--- a/LICENSING.md
+++ b/LICENSING.md
@@ -14,6 +14,10 @@ that suits best your particular use case. You can
also continue to use the
file under the dual license. When choosing only one, remove the reference to
the other from the file header.

+The inmate library is distributed under the terms of the GPLv2 with a special
+exception that allows static or dynamic linking to independent modules. See the
+file [inmates/lib/COPYING](inmates/lib/COPYING) for further information.
+

License Usage
-------------
diff --git a/inmates/lib/COPYING b/inmates/lib/COPYING
new file mode 100644
index 0000000..e698e6a
--- /dev/null
+++ b/inmates/lib/COPYING
@@ -0,0 +1,18 @@
+The inmate library is distributed under the terms of the GNU General Public
+License contained in the COPYING file in the top-level directory with the
+following clarification and special exception.
+
+Linking this library statically or dynamically with other modules is making a
+combined work based on this library. Thus, the terms and conditions of the GNU
+General Public License cover the whole combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent modules, and
+to copy and distribute the resulting executable under terms of your choice,
+provided that you also meet, for each linked independent module, the terms and
+conditions of the license of that module. An independent module is a module
+which is not derived from or based on this library. If you modify this library,
+you may extend this exception to your version of the library, but you are not
+obliged to do so. If you do not wish to do so, delete this exception statement
+from your version.
diff --git a/inmates/lib/arm-common/Makefile.lib
b/inmates/lib/arm-common/Makefile.lib
index f66f452..ec0e98d 100644
--- a/inmates/lib/arm-common/Makefile.lib
+++ b/inmates/lib/arm-common/Makefile.lib
@@ -6,9 +6,9 @@
# Authors:
# Ralf Ramsauer <ralf.r...@oth-regensburg.de>
#
-# This work is licensed under the terms of the GNU GPL, version 2. See
-# the COPYING file in the top-level directory.
-#
+# This work is licensed under the terms of the GNU GPL, version 2 with
+# a special exception allowing static and dynamic linking.
+# See the COPYING file in the inmates/lib directory.

GCOV_PROFILE := n

diff --git a/inmates/lib/arm-common/gic-v2.c b/inmates/lib/arm-common/gic-v2.c
index 23d5b5f..f5b60c2 100644
--- a/inmates/lib/arm-common/gic-v2.c
+++ b/inmates/lib/arm-common/gic-v2.c
@@ -6,8 +6,9 @@
* Authors:
* Jean-Philippe Brucker <jean-phili...@arm.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#include <mach.h>
diff --git a/inmates/lib/arm-common/gic.c b/inmates/lib/arm-common/gic.c
index 22014d3..8156b9f 100644
--- a/inmates/lib/arm-common/gic.c
+++ b/inmates/lib/arm-common/gic.c
@@ -6,8 +6,9 @@
* Authors:
* Jean-Philippe Brucker <jean-phili...@arm.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#include <inmate.h>
diff --git a/inmates/lib/arm-common/include/gic.h
b/inmates/lib/arm-common/include/gic.h
index fc7963e..0cc8db8 100644
--- a/inmates/lib/arm-common/include/gic.h
+++ b/inmates/lib/arm-common/include/gic.h
@@ -6,8 +6,9 @@
* Authors:
* Jean-Philippe Brucker <jean-phili...@arm.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#ifndef _JAILHOUSE_INMATES_GIC_H
diff --git a/inmates/lib/arm-common/include/inmate.h
b/inmates/lib/arm-common/include/inmate.h
index 99ab37f..40b86fa 100644
--- a/inmates/lib/arm-common/include/inmate.h
+++ b/inmates/lib/arm-common/include/inmate.h
@@ -6,8 +6,9 @@
* Authors:
* Jean-Philippe Brucker <jean-phili...@arm.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#ifndef _JAILHOUSE_INMATE_H
diff --git a/inmates/lib/arm-common/include/uart.h
b/inmates/lib/arm-common/include/uart.h
index 0ef455b..16bbce5 100644
--- a/inmates/lib/arm-common/include/uart.h
+++ b/inmates/lib/arm-common/include/uart.h
@@ -6,8 +6,9 @@
* Authors:
* Ralf Ramsauer <ralf.r...@oth-regensburg.de>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

struct uart_chip {
diff --git a/inmates/lib/arm-common/printk.c b/inmates/lib/arm-common/printk.c
index b9e4ee7..da8c38a 100644
--- a/inmates/lib/arm-common/printk.c
+++ b/inmates/lib/arm-common/printk.c
@@ -6,8 +6,9 @@
* Authors:
* Jean-Philippe Brucker <jean-phili...@arm.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#include <inmate.h>
diff --git a/inmates/lib/arm-common/timer.c b/inmates/lib/arm-common/timer.c
index 4681a69..5932e24 100644
--- a/inmates/lib/arm-common/timer.c
+++ b/inmates/lib/arm-common/timer.c
@@ -8,8 +8,9 @@
* Jean-Philippe Brucker <jean-phili...@arm.com>
* Jan Kiszka <jan.k...@siemens.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#include <asm/sysregs.h>
diff --git a/inmates/lib/arm-common/uart-8250.c
b/inmates/lib/arm-common/uart-8250.c
index 4eafe77..9fadf95 100644
--- a/inmates/lib/arm-common/uart-8250.c
+++ b/inmates/lib/arm-common/uart-8250.c
@@ -8,8 +8,9 @@
* Jean-Philippe Brucker <jean-phili...@arm.com>
* Jan Kiszka <jan.k...@siemens.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#include <inmate.h>
diff --git a/inmates/lib/arm-common/uart-jailhouse.c
b/inmates/lib/arm-common/uart-jailhouse.c
index 6678884..69bea98 100644
--- a/inmates/lib/arm-common/uart-jailhouse.c
+++ b/inmates/lib/arm-common/uart-jailhouse.c
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <jan.k...@siemens.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#include <inmate.h>
diff --git a/inmates/lib/arm-common/uart-pl011.c
b/inmates/lib/arm-common/uart-pl011.c
index 9657684..8d7effa 100644
--- a/inmates/lib/arm-common/uart-pl011.c
+++ b/inmates/lib/arm-common/uart-pl011.c
@@ -6,8 +6,9 @@
* Authors:
* Jean-Philippe Brucker <jean-phili...@arm.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#include <inmate.h>
diff --git a/inmates/lib/arm-common/uart-xuartps.c
b/inmates/lib/arm-common/uart-xuartps.c
index e6518e1..313a008 100644
--- a/inmates/lib/arm-common/uart-xuartps.c
+++ b/inmates/lib/arm-common/uart-xuartps.c
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <jan.k...@siemens.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#include <inmate.h>
diff --git a/inmates/lib/arm/Makefile b/inmates/lib/arm/Makefile
index 7326c32..da7597e 100644
--- a/inmates/lib/arm/Makefile
+++ b/inmates/lib/arm/Makefile
@@ -6,8 +6,9 @@
# Authors:
# Jan Kiszka <jan.k...@siemens.com>
#
-# This work is licensed under the terms of the GNU GPL, version 2. See
-# the COPYING file in the top-level directory.
+# This work is licensed under the terms of the GNU GPL, version 2 with
+# a special exception allowing static and dynamic linking.
+# See the COPYING file in the inmates/lib directory.
#

include $(INMATES_LIB)/Makefile.lib
diff --git a/inmates/lib/arm/Makefile.lib b/inmates/lib/arm/Makefile.lib
index f84b84e..722b045 100644
--- a/inmates/lib/arm/Makefile.lib
+++ b/inmates/lib/arm/Makefile.lib
@@ -8,8 +8,9 @@
# Jean-Philippe Brucker <jean-phili...@arm.com>
# Jan Kiszka <jan.k...@siemens.com>
#
-# This work is licensed under the terms of the GNU GPL, version 2. See
-# the COPYING file in the top-level directory.
+# This work is licensed under the terms of the GNU GPL, version 2 with
+# a special exception allowing static and dynamic linking.
+# See the COPYING file in the inmates/lib directory.
#

KBUILD_AFLAGS := $(filter-out -include asm/unified.h,$(KBUILD_AFLAGS))
diff --git a/inmates/lib/arm/gic-v3.c b/inmates/lib/arm/gic-v3.c
index 6831597..189f21d 100644
--- a/inmates/lib/arm/gic-v3.c
+++ b/inmates/lib/arm/gic-v3.c
@@ -6,8 +6,9 @@
* Authors:
* Jean-Philippe Brucker <jean-phili...@arm.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#include <asm/sysregs.h>
diff --git a/inmates/lib/arm/header.S b/inmates/lib/arm/header.S
index 72fe3a0..4eb74c6 100644
--- a/inmates/lib/arm/header.S
+++ b/inmates/lib/arm/header.S
@@ -8,8 +8,9 @@
* Jean-Philippe Brucker <jean-phili...@arm.com>
* Jan Kiszka <jan.k...@siemens.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#include <asm/sysregs.h>
diff --git a/inmates/lib/arm/include/arch/gic.h
b/inmates/lib/arm/include/arch/gic.h
index 9e1e988..ab504f6 100644
--- a/inmates/lib/arm/include/arch/gic.h
+++ b/inmates/lib/arm/include/arch/gic.h
@@ -6,8 +6,9 @@
* Authors:
* Jean-Philippe Brucker <jean-phili...@arm.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#ifndef __ASSEMBLY__
diff --git a/inmates/lib/arm/include/arch/inmate.h
b/inmates/lib/arm/include/arch/inmate.h
index f113c9a..0855550 100644
--- a/inmates/lib/arm/include/arch/inmate.h
+++ b/inmates/lib/arm/include/arch/inmate.h
@@ -6,8 +6,9 @@
* Authors:
* Jean-Philippe Brucker <jean-phili...@arm.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

/*
diff --git a/inmates/lib/arm/include/mach.h b/inmates/lib/arm/include/mach.h
index a255947..87d4b8e 100644
--- a/inmates/lib/arm/include/mach.h
+++ b/inmates/lib/arm/include/mach.h
@@ -8,8 +8,9 @@
* Jan Kiszka <jan.k...@siemens.com>
* Jean-Philippe Brucker <jean-phili...@arm.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#ifdef CONFIG_MACH_JETSON_TK1
diff --git a/inmates/lib/arm/inmate.lds.S b/inmates/lib/arm/inmate.lds.S
index 2164947..66782df 100644
--- a/inmates/lib/arm/inmate.lds.S
+++ b/inmates/lib/arm/inmate.lds.S
@@ -8,8 +8,9 @@
* Jean-Philippe Brucker <jean-phili...@arm.com>
* Jan Kiszka <jan.k...@siemens.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#include <jailhouse/config.h>
diff --git a/inmates/lib/arm64/Makefile b/inmates/lib/arm64/Makefile
index 554c0d1..d50a144 100644
--- a/inmates/lib/arm64/Makefile
+++ b/inmates/lib/arm64/Makefile
@@ -6,8 +6,9 @@
# Authors:
# Jan Kiszka <jan.k...@siemens.com>
#
-# This work is licensed under the terms of the GNU GPL, version 2. See
-# the COPYING file in the top-level directory.
+# This work is licensed under the terms of the GNU GPL, version 2 with
+# a special exception allowing static and dynamic linking.
+# See the COPYING file in the inmates/lib directory.
#

include $(INMATES_LIB)/Makefile.lib
diff --git a/inmates/lib/arm64/Makefile.lib b/inmates/lib/arm64/Makefile.lib
index 7481f8d..c9f19a7 100644
--- a/inmates/lib/arm64/Makefile.lib
+++ b/inmates/lib/arm64/Makefile.lib
@@ -8,8 +8,9 @@
# Jean-Philippe Brucker <jean-phili...@arm.com>
# Jan Kiszka <jan.k...@siemens.com>
#
-# This work is licensed under the terms of the GNU GPL, version 2. See
-# the COPYING file in the top-level directory.
+# This work is licensed under the terms of the GNU GPL, version 2 with
+# a special exception allowing static and dynamic linking.
+# See the COPYING file in the inmates/lib directory.
#

LINUXINCLUDE += -I$(INMATES_LIB)/include
diff --git a/inmates/lib/arm64/header.S b/inmates/lib/arm64/header.S
index fe7bae7..fdac438 100644
--- a/inmates/lib/arm64/header.S
+++ b/inmates/lib/arm64/header.S
@@ -6,8 +6,9 @@
* Authors:
* Antonios Motakis <antonios...@huawei.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

.macro ventry label
diff --git a/inmates/lib/arm64/include/arch/gic.h
b/inmates/lib/arm64/include/arch/gic.h
index 7cfe99e..00d1fec 100644
--- a/inmates/lib/arm64/include/arch/gic.h
+++ b/inmates/lib/arm64/include/arch/gic.h
@@ -6,8 +6,9 @@
* Authors:
* Ralf Ramsauer <ralf.r...@oth-regensburg.de>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#define gic_setup_irq_stack()
diff --git a/inmates/lib/arm64/include/arch/inmate.h
b/inmates/lib/arm64/include/arch/inmate.h
index 2b473d1..095ba23 100644
--- a/inmates/lib/arm64/include/arch/inmate.h
+++ b/inmates/lib/arm64/include/arch/inmate.h
@@ -6,8 +6,9 @@
* Authors:
* Jean-Philippe Brucker <jean-phili...@arm.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

/*
diff --git a/inmates/lib/arm64/include/mach.h b/inmates/lib/arm64/include/mach.h
index af4f012..ac79d87 100644
--- a/inmates/lib/arm64/include/mach.h
+++ b/inmates/lib/arm64/include/mach.h
@@ -8,8 +8,9 @@
* Antonios Motakis <antonios...@huawei.com>
* Jan Kiszka <jan.k...@siemens.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#ifdef CONFIG_MACH_AMD_SEATTLE
diff --git a/inmates/lib/arm64/inmate.lds.S b/inmates/lib/arm64/inmate.lds.S
index d6fb328..3c8b69c 100644
--- a/inmates/lib/arm64/inmate.lds.S
+++ b/inmates/lib/arm64/inmate.lds.S
@@ -6,8 +6,9 @@
* Authors:
* Antonios Motakis <antonios...@huawei.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#include <jailhouse/config.h>
diff --git a/inmates/lib/cmdline.c b/inmates/lib/cmdline.c
index f6dc79c..bb0cf5d 100644
--- a/inmates/lib/cmdline.c
+++ b/inmates/lib/cmdline.c
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <jan.k...@siemens.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#include <inmate.h>
diff --git a/inmates/lib/inmate_common.h b/inmates/lib/inmate_common.h
index c4c6b17..0aa1693 100644
--- a/inmates/lib/inmate_common.h
+++ b/inmates/lib/inmate_common.h
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <jan.k...@siemens.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#define NULL ((void *)0)
diff --git a/inmates/lib/pci.c b/inmates/lib/pci.c
index 99b57e1..f80bb75 100644
--- a/inmates/lib/pci.c
+++ b/inmates/lib/pci.c
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <jan.k...@siemens.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#include <inmate.h>
diff --git a/inmates/lib/string.c b/inmates/lib/string.c
index e013e5a..db5a0e8 100644
--- a/inmates/lib/string.c
+++ b/inmates/lib/string.c
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <jan.k...@siemens.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#include <inmate.h>
diff --git a/inmates/lib/x86/Makefile b/inmates/lib/x86/Makefile
index dc5890d..dfcf16e 100644
--- a/inmates/lib/x86/Makefile
+++ b/inmates/lib/x86/Makefile
@@ -6,8 +6,9 @@
# Authors:
# Jan Kiszka <jan.k...@siemens.com>
#
-# This work is licensed under the terms of the GNU GPL, version 2. See
-# the COPYING file in the top-level directory.
+# This work is licensed under the terms of the GNU GPL, version 2 with
+# a special exception allowing static and dynamic linking.
+# See the COPYING file in the inmates/lib directory.
#

include $(INMATES_LIB)/Makefile.lib
diff --git a/inmates/lib/x86/Makefile.lib b/inmates/lib/x86/Makefile.lib
index 54bddae..e2ff845 100644
--- a/inmates/lib/x86/Makefile.lib
+++ b/inmates/lib/x86/Makefile.lib
@@ -6,8 +6,9 @@
# Authors:
# Jan Kiszka <jan.k...@siemens.com>
#
-# This work is licensed under the terms of the GNU GPL, version 2. See
-# the COPYING file in the top-level directory.
+# This work is licensed under the terms of the GNU GPL, version 2 with
+# a special exception allowing static and dynamic linking.
+# See the COPYING file in the inmates/lib directory.
#

KBUILD_CFLAGS += -m64 -mno-red-zone
diff --git a/inmates/lib/x86/header-32.S b/inmates/lib/x86/header-32.S
index 31a39fb..6310e18 100644
--- a/inmates/lib/x86/header-32.S
+++ b/inmates/lib/x86/header-32.S
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <jan.k...@siemens.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#include <inmate.h>
diff --git a/inmates/lib/x86/header.S b/inmates/lib/x86/header.S
index f3037dc..a083f99 100644
--- a/inmates/lib/x86/header.S
+++ b/inmates/lib/x86/header.S
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <jan.k...@siemens.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#include <inmate.h>
diff --git a/inmates/lib/x86/hypercall.c b/inmates/lib/x86/hypercall.c
index f710376..4f8b7fd 100644
--- a/inmates/lib/x86/hypercall.c
+++ b/inmates/lib/x86/hypercall.c
@@ -6,8 +6,9 @@
* Authors:
* Valentine Sinitsyn <valentine...@gmail.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#include <inmate.h>
diff --git a/inmates/lib/x86/inmate.h b/inmates/lib/x86/inmate.h
index e255538..41724e0 100644
--- a/inmates/lib/x86/inmate.h
+++ b/inmates/lib/x86/inmate.h
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <jan.k...@siemens.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#ifndef _JAILHOUSE_INMATE_H
diff --git a/inmates/lib/x86/inmate.lds b/inmates/lib/x86/inmate.lds
index de6e592..6d4b634 100644
--- a/inmates/lib/x86/inmate.lds
+++ b/inmates/lib/x86/inmate.lds
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <jan.k...@siemens.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

/*
diff --git a/inmates/lib/x86/int.c b/inmates/lib/x86/int.c
index 6c4335d..2f5c171 100644
--- a/inmates/lib/x86/int.c
+++ b/inmates/lib/x86/int.c
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <jan.k...@siemens.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#include <inmate.h>
diff --git a/inmates/lib/x86/ioapic.c b/inmates/lib/x86/ioapic.c
index de96e21..836a405 100644
--- a/inmates/lib/x86/ioapic.c
+++ b/inmates/lib/x86/ioapic.c
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <jan.k...@siemens.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#include <inmate.h>
diff --git a/inmates/lib/x86/mem.c b/inmates/lib/x86/mem.c
index 3ae7aae..6b7befd 100644
--- a/inmates/lib/x86/mem.c
+++ b/inmates/lib/x86/mem.c
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <jan.k...@siemens.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#include <inmate.h>
diff --git a/inmates/lib/x86/pci.c b/inmates/lib/x86/pci.c
index 688018b..dffe38c 100644
--- a/inmates/lib/x86/pci.c
+++ b/inmates/lib/x86/pci.c
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <jan.k...@siemens.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#include <inmate.h>
diff --git a/inmates/lib/x86/printk.c b/inmates/lib/x86/printk.c
index 17a2cc3..550c7fe 100644
--- a/inmates/lib/x86/printk.c
+++ b/inmates/lib/x86/printk.c
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <jan.k...@siemens.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#include <stdarg.h>
diff --git a/inmates/lib/x86/smp.c b/inmates/lib/x86/smp.c
index accbb20..6e0855d 100644
--- a/inmates/lib/x86/smp.c
+++ b/inmates/lib/x86/smp.c
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <jan.k...@siemens.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#include <inmate.h>
diff --git a/inmates/lib/x86/timing.c b/inmates/lib/x86/timing.c
index 2a0e231..fd46cf7 100644
--- a/inmates/lib/x86/timing.c
+++ b/inmates/lib/x86/timing.c
@@ -6,8 +6,9 @@
* Authors:
* Jan Kiszka <jan.k...@siemens.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 with
+ * a special exception allowing static and dynamic linking.
+ * See the COPYING file in the inmates/lib directory.
*/

#include <inmate.h>
--
2.7.4

Jan Kiszka

unread,

Jun 13, 2017, 8:44:22 AM6/13/17

to Claudio Scordino, Gustavo Lima Chaves, Jailhouse, Andreas Rollbühler

On 2017-06-12 10:09, Claudio Scordino wrote:
> ========================================
>
> Subject: Request for relicensing your contribution to Jailhouse
>
>
> Dear developer,
>
> your name is listed among the authors of the source code within the
> inmates/lib/ directory of Jailhouse, and therefore you are among the copyright
> holders of a part of such library.
>
> The library is currently licensed under GPL, meaning that it cannot be linked
> to proprietary code unless by releasing such code under GPL. This prevents the
> usage of the hypervisor in all industrial contexts where the inmate code cannot
> be disclosed. For this reason, the jailhouse community is currently discussing
> [1] the possibility/opportunity of changing the license of just the inmate
> library to one allowing static linking of proprietary code (e.g., GPL+linking
> exception [2]). The license of the hypervisor and of the Linux driver will
> remain untouched.

As the discussion went on, it turned out to be easier to use the dual
license GPL|BSD-2-Clause here as well, just like we did for the includes
already. That would allow to smoothly integrate the code into
permissively licensed projects, or proprietary ones.

Furthermore, I would state that we "want to re-license to X" and are
requesting to confirm this step by sending a signed-off under the patch.
See
https://groups.google.com/forum/#!searchin/jailhouse-dev/License$20and$20copyright$20fine-tuning%7Csort:relevance/jailhouse-dev/Xbg2z5ADL3Q/HNzyjoeJPEgJ
for how this went through the last time.

Thanks,
Jan

Claudio Scordino

unread,

Jun 14, 2017, 5:14:06 AM6/14/17

to Jan Kiszka, Gustavo Lima Chaves, Jailhouse, Andreas Rollbühler

Dear all,

2017-06-13 14:44 GMT+02:00 Jan Kiszka <jan.k...@siemens.com>:
>
> On 2017-06-12 10:09, Claudio Scordino wrote:
> > ========================================
> >
> > Subject: Request for relicensing your contribution to Jailhouse
> >
> >
> > Dear developer,
> >
> > your name is listed among the authors of the source code within the
> > inmates/lib/ directory of Jailhouse, and therefore you are among the copyright
> > holders of a part of such library.
> >
> > The library is currently licensed under GPL, meaning that it cannot be linked
> > to proprietary code unless by releasing such code under GPL. This prevents the
> > usage of the hypervisor in all industrial contexts where the inmate code cannot
> > be disclosed. For this reason, the jailhouse community is currently discussing
> > [1] the possibility/opportunity of changing the license of just the inmate
> > library to one allowing static linking of proprietary code (e.g., GPL+linking
> > exception [2]). The license of the hypervisor and of the Linux driver will
> > remain untouched.
>
> As the discussion went on, it turned out to be easier to use the dual
> license GPL|BSD-2-Clause here as well, just like we did for the includes
> already. That would allow to smoothly integrate the code into
> permissively licensed projects, or proprietary ones.

I agree.

> Furthermore, I would state that we "want to re-license to X" and are
> requesting to confirm this step by sending a signed-off under the patch.
> See
> https://groups.google.com/forum/#!searchin/jailhouse-dev/License$20and$20copyright$20fine-tuning%7Csort:relevance/jailhouse-dev/Xbg2z5ADL3Q/HNzyjoeJPEgJ
> for how this went through the last time.

Below the new version of both the email and the patch.

Many thanks and best regards,

Claudio

==============================

Subject: Request for relicensing your contribution to Jailhouse

CC: jan, jailhouse-list

Dear developer,

your name is listed among the authors of some file within the inmates/lib/

directory of Jailhouse, and therefore you are among the copyright holders of a
part of such library.

The library is currently licensed under GPL, meaning that it cannot be linked

to proprietary code unless by releasing such code under GPL too. This prevents

the usage of the hypervisor in all industrial contexts where the inmate code
cannot be disclosed.

For this reason, we want to re-license the inmate library to a dual GPL|BSD-2
license, as already done for the Jailhouse headers [1]. The license of the
other components of Jailhouse will remain untouched.

A re-licensing of the source code needs the unanimous consent of all the
copyright holders of the library. The proposed change is pasted below.
I kindly ask you to reply to patch with your signed-off-by line if you agree to
this change.

Don't hesitate to contact me in case you need any further clarification.

Many thanks for your time and your contribution.

Best regards.

Claudio

[1] https://groups.google.com/forum/#!topic/jailhouse-dev/eskAY0BGhWc

==============================

From a167953212b218097207d4bbfed16c2e7058c4d7 Mon Sep 17 00:00:00 2001
From: Claudio Scordino <cla...@evidence.eu.com>
Date: Wed, 14 Jun 2017 10:36:34 +0200
Subject: [PATCH] Provide the inmate library under BSD-2 license too.

This patch does not introduce any functional change, but "only" deals
with copyright and license aspects.

The rationale is simply that, as was already stated in COPYING, cell
inmates, AKA guests, are not derived work of Jailhouse, even if written
exclusively to run in its special environment. The inmate library
provides a set of functionalities to let inmates run on Jailhouse.
In order to avoid that people need to rewrite such library, possibly
introducing bugs or incompatibilities this way, we should rather enable
the reuse of the "official" one. Thus, it should be provided also under a
permissive license. BSD 2-clause is a well-established and easy-to-deal
with license, already used for the Jailhouse headers.

IMPORTANT: In order to perform these license changes, we need the
agreement of all contributors to the affected files. So please reply to
the individual patches with your signed-off-by line if you agree.
The patch won't be committed until everyone involved did this.
Please also speak up if you think you or someone else has been missed in
this process.

Signed-off-by: Claudio Scordino <cla...@evidence.eu.com>
---

inmates/lib/arm-common/Makefile.lib | 26 ++++++++++++++++++++++++++
inmates/lib/arm-common/gic-v2.c | 26 ++++++++++++++++++++++++++
inmates/lib/arm-common/gic.c | 26 ++++++++++++++++++++++++++
inmates/lib/arm-common/include/gic.h | 26 ++++++++++++++++++++++++++
inmates/lib/arm-common/include/inmate.h | 26 ++++++++++++++++++++++++++
inmates/lib/arm-common/include/uart.h | 26 ++++++++++++++++++++++++++
inmates/lib/arm-common/printk.c | 26 ++++++++++++++++++++++++++
inmates/lib/arm-common/timer.c | 26 ++++++++++++++++++++++++++
inmates/lib/arm-common/uart-8250.c | 26 ++++++++++++++++++++++++++
inmates/lib/arm-common/uart-jailhouse.c | 26 ++++++++++++++++++++++++++
inmates/lib/arm-common/uart-pl011.c | 26 ++++++++++++++++++++++++++
inmates/lib/arm-common/uart-xuartps.c | 26 ++++++++++++++++++++++++++
inmates/lib/arm/Makefile | 26 ++++++++++++++++++++++++++
inmates/lib/arm/Makefile.lib | 26 ++++++++++++++++++++++++++
inmates/lib/arm/gic-v3.c | 26 ++++++++++++++++++++++++++
inmates/lib/arm/header.S | 26 ++++++++++++++++++++++++++
inmates/lib/arm/include/arch/gic.h | 26 ++++++++++++++++++++++++++
inmates/lib/arm/include/arch/inmate.h | 26 ++++++++++++++++++++++++++
inmates/lib/arm/include/mach.h | 26 ++++++++++++++++++++++++++
inmates/lib/arm/inmate.lds.S | 26 ++++++++++++++++++++++++++
inmates/lib/arm64/Makefile | 26 ++++++++++++++++++++++++++
inmates/lib/arm64/Makefile.lib | 26 ++++++++++++++++++++++++++
inmates/lib/arm64/header.S | 26 ++++++++++++++++++++++++++
inmates/lib/arm64/include/arch/gic.h | 26 ++++++++++++++++++++++++++
inmates/lib/arm64/include/arch/inmate.h | 26 ++++++++++++++++++++++++++
inmates/lib/arm64/include/mach.h | 26 ++++++++++++++++++++++++++
inmates/lib/arm64/inmate.lds.S | 26 ++++++++++++++++++++++++++
inmates/lib/cmdline.c | 26 ++++++++++++++++++++++++++
inmates/lib/inmate_common.h | 26 ++++++++++++++++++++++++++
inmates/lib/pci.c | 26 ++++++++++++++++++++++++++
inmates/lib/string.c | 26 ++++++++++++++++++++++++++
inmates/lib/x86/Makefile | 26 ++++++++++++++++++++++++++
inmates/lib/x86/Makefile.lib | 26 ++++++++++++++++++++++++++
inmates/lib/x86/header-32.S | 26 ++++++++++++++++++++++++++
inmates/lib/x86/header.S | 26 ++++++++++++++++++++++++++
inmates/lib/x86/hypercall.c | 26 ++++++++++++++++++++++++++
inmates/lib/x86/inmate.h | 26 ++++++++++++++++++++++++++
inmates/lib/x86/inmate.lds | 26 ++++++++++++++++++++++++++
inmates/lib/x86/int.c | 26 ++++++++++++++++++++++++++
inmates/lib/x86/ioapic.c | 26 ++++++++++++++++++++++++++
inmates/lib/x86/mem.c | 26 ++++++++++++++++++++++++++
inmates/lib/x86/pci.c | 26 ++++++++++++++++++++++++++
inmates/lib/x86/printk.c | 26 ++++++++++++++++++++++++++
inmates/lib/x86/smp.c | 26 ++++++++++++++++++++++++++
inmates/lib/x86/timing.c | 26 ++++++++++++++++++++++++++
45 files changed, 1170 insertions(+)

diff --git a/inmates/lib/arm-common/Makefile.lib
b/inmates/lib/arm-common/Makefile.lib
index f66f452..66daac0 100644
--- a/inmates/lib/arm-common/Makefile.lib
+++ b/inmates/lib/arm-common/Makefile.lib
@@ -9,6 +9,32 @@

# This work is licensed under the terms of the GNU GPL, version 2. See

# the COPYING file in the top-level directory.

#
+# Alternatively, you can use or redistribute this file under the following
+# BSD license:
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+# THE POSSIBILITY OF SUCH DAMAGE.
+#

GCOV_PROFILE := n

diff --git a/inmates/lib/arm-common/gic-v2.c b/inmates/lib/arm-common/gic-v2.c

index 23d5b5f..1bc775c 100644
--- a/inmates/lib/arm-common/gic-v2.c
+++ b/inmates/lib/arm-common/gic-v2.c
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

+ * Alternatively, you can use or redistribute this file under the following
+ * BSD license:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.

*/

#include <mach.h>
diff --git a/inmates/lib/arm-common/gic.c b/inmates/lib/arm-common/gic.c

index 22014d3..5c2ba45 100644
--- a/inmates/lib/arm-common/gic.c
+++ b/inmates/lib/arm-common/gic.c
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#include <inmate.h>
diff --git a/inmates/lib/arm-common/include/gic.h
b/inmates/lib/arm-common/include/gic.h

index fc7963e..7d6fc89 100644
--- a/inmates/lib/arm-common/include/gic.h
+++ b/inmates/lib/arm-common/include/gic.h
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#ifndef _JAILHOUSE_INMATES_GIC_H
diff --git a/inmates/lib/arm-common/include/inmate.h
b/inmates/lib/arm-common/include/inmate.h

index 99ab37f..3d35f35 100644
--- a/inmates/lib/arm-common/include/inmate.h
+++ b/inmates/lib/arm-common/include/inmate.h
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#ifndef _JAILHOUSE_INMATE_H
diff --git a/inmates/lib/arm-common/include/uart.h
b/inmates/lib/arm-common/include/uart.h

index 0ef455b..5bf0030 100644
--- a/inmates/lib/arm-common/include/uart.h
+++ b/inmates/lib/arm-common/include/uart.h
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

struct uart_chip {
diff --git a/inmates/lib/arm-common/printk.c b/inmates/lib/arm-common/printk.c

index b9e4ee7..910e1fc 100644
--- a/inmates/lib/arm-common/printk.c
+++ b/inmates/lib/arm-common/printk.c
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#include <inmate.h>
diff --git a/inmates/lib/arm-common/timer.c b/inmates/lib/arm-common/timer.c

index 4681a69..1a2f0c6 100644
--- a/inmates/lib/arm-common/timer.c
+++ b/inmates/lib/arm-common/timer.c
@@ -10,6 +10,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#include <asm/sysregs.h>
diff --git a/inmates/lib/arm-common/uart-8250.c
b/inmates/lib/arm-common/uart-8250.c

index 4eafe77..4cfaed2 100644
--- a/inmates/lib/arm-common/uart-8250.c
+++ b/inmates/lib/arm-common/uart-8250.c
@@ -10,6 +10,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#include <inmate.h>
diff --git a/inmates/lib/arm-common/uart-jailhouse.c
b/inmates/lib/arm-common/uart-jailhouse.c

index 6678884..28d1228 100644
--- a/inmates/lib/arm-common/uart-jailhouse.c
+++ b/inmates/lib/arm-common/uart-jailhouse.c
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#include <inmate.h>
diff --git a/inmates/lib/arm-common/uart-pl011.c
b/inmates/lib/arm-common/uart-pl011.c

index 9657684..12cb2e5 100644
--- a/inmates/lib/arm-common/uart-pl011.c
+++ b/inmates/lib/arm-common/uart-pl011.c
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#include <inmate.h>
diff --git a/inmates/lib/arm-common/uart-xuartps.c
b/inmates/lib/arm-common/uart-xuartps.c

index e6518e1..6b04e49 100644
--- a/inmates/lib/arm-common/uart-xuartps.c
+++ b/inmates/lib/arm-common/uart-xuartps.c
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#include <inmate.h>
diff --git a/inmates/lib/arm/Makefile b/inmates/lib/arm/Makefile

index 7326c32..e875eb2 100644
--- a/inmates/lib/arm/Makefile
+++ b/inmates/lib/arm/Makefile
@@ -9,6 +9,32 @@

# This work is licensed under the terms of the GNU GPL, version 2. See

# the COPYING file in the top-level directory.

# This work is licensed under the terms of the GNU GPL, version 2. See

# the COPYING file in the top-level directory.

KBUILD_AFLAGS := $(filter-out -include asm/unified.h,$(KBUILD_AFLAGS))

diff --git a/inmates/lib/arm/gic-v3.c b/inmates/lib/arm/gic-v3.c

index 6831597..868e376 100644
--- a/inmates/lib/arm/gic-v3.c
+++ b/inmates/lib/arm/gic-v3.c
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#include <asm/sysregs.h>
diff --git a/inmates/lib/arm/header.S b/inmates/lib/arm/header.S

index 72fe3a0..d0a8f21 100644
--- a/inmates/lib/arm/header.S
+++ b/inmates/lib/arm/header.S
@@ -10,6 +10,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#include <asm/sysregs.h>
diff --git a/inmates/lib/arm/include/arch/gic.h
b/inmates/lib/arm/include/arch/gic.h

index 9e1e988..7b28221 100644
--- a/inmates/lib/arm/include/arch/gic.h
+++ b/inmates/lib/arm/include/arch/gic.h
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#ifndef __ASSEMBLY__
diff --git a/inmates/lib/arm/include/arch/inmate.h
b/inmates/lib/arm/include/arch/inmate.h

index f113c9a..5d65edf 100644
--- a/inmates/lib/arm/include/arch/inmate.h
+++ b/inmates/lib/arm/include/arch/inmate.h
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

/*
diff --git a/inmates/lib/arm/include/mach.h b/inmates/lib/arm/include/mach.h

index a255947..38643df 100644
--- a/inmates/lib/arm/include/mach.h
+++ b/inmates/lib/arm/include/mach.h
@@ -10,6 +10,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#ifdef CONFIG_MACH_JETSON_TK1
diff --git a/inmates/lib/arm/inmate.lds.S b/inmates/lib/arm/inmate.lds.S

index 2164947..6f64b5e 100644
--- a/inmates/lib/arm/inmate.lds.S
+++ b/inmates/lib/arm/inmate.lds.S
@@ -10,6 +10,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#include <jailhouse/config.h>
diff --git a/inmates/lib/arm64/Makefile b/inmates/lib/arm64/Makefile

index 554c0d1..842e954 100644
--- a/inmates/lib/arm64/Makefile
+++ b/inmates/lib/arm64/Makefile
@@ -9,6 +9,32 @@

# This work is licensed under the terms of the GNU GPL, version 2. See

# the COPYING file in the top-level directory.

# This work is licensed under the terms of the GNU GPL, version 2. See

# the COPYING file in the top-level directory.

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

.macro ventry label
diff --git a/inmates/lib/arm64/include/arch/gic.h
b/inmates/lib/arm64/include/arch/gic.h

index 7cfe99e..8072066 100644
--- a/inmates/lib/arm64/include/arch/gic.h
+++ b/inmates/lib/arm64/include/arch/gic.h
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#define gic_setup_irq_stack()
diff --git a/inmates/lib/arm64/include/arch/inmate.h
b/inmates/lib/arm64/include/arch/inmate.h

index 2b473d1..c1421b6 100644
--- a/inmates/lib/arm64/include/arch/inmate.h
+++ b/inmates/lib/arm64/include/arch/inmate.h
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

/*
diff --git a/inmates/lib/arm64/include/mach.h b/inmates/lib/arm64/include/mach.h

index af4f012..b4d5a15 100644
--- a/inmates/lib/arm64/include/mach.h
+++ b/inmates/lib/arm64/include/mach.h
@@ -10,6 +10,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#ifdef CONFIG_MACH_AMD_SEATTLE
diff --git a/inmates/lib/arm64/inmate.lds.S b/inmates/lib/arm64/inmate.lds.S

index d6fb328..a2db6ac 100644
--- a/inmates/lib/arm64/inmate.lds.S
+++ b/inmates/lib/arm64/inmate.lds.S
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#include <jailhouse/config.h>
diff --git a/inmates/lib/cmdline.c b/inmates/lib/cmdline.c

index f6dc79c..e7abd01 100644
--- a/inmates/lib/cmdline.c
+++ b/inmates/lib/cmdline.c
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#include <inmate.h>
diff --git a/inmates/lib/inmate_common.h b/inmates/lib/inmate_common.h

index c4c6b17..54f0279 100644
--- a/inmates/lib/inmate_common.h
+++ b/inmates/lib/inmate_common.h
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#define NULL ((void *)0)
diff --git a/inmates/lib/pci.c b/inmates/lib/pci.c

index 99b57e1..a8d77c2 100644
--- a/inmates/lib/pci.c
+++ b/inmates/lib/pci.c
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#include <inmate.h>
diff --git a/inmates/lib/string.c b/inmates/lib/string.c

index e013e5a..592c176 100644
--- a/inmates/lib/string.c
+++ b/inmates/lib/string.c
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#include <inmate.h>
diff --git a/inmates/lib/x86/Makefile b/inmates/lib/x86/Makefile

index dc5890d..de4d74b 100644
--- a/inmates/lib/x86/Makefile
+++ b/inmates/lib/x86/Makefile
@@ -9,6 +9,32 @@

# This work is licensed under the terms of the GNU GPL, version 2. See

# the COPYING file in the top-level directory.

include $(INMATES_LIB)/Makefile.lib

diff --git a/inmates/lib/x86/Makefile.lib b/inmates/lib/x86/Makefile.lib

index 54bddae..3f16775 100644
--- a/inmates/lib/x86/Makefile.lib
+++ b/inmates/lib/x86/Makefile.lib
@@ -9,6 +9,32 @@

# This work is licensed under the terms of the GNU GPL, version 2. See

# the COPYING file in the top-level directory.

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#include <inmate.h>
diff --git a/inmates/lib/x86/header.S b/inmates/lib/x86/header.S

index f3037dc..de3717b 100644
--- a/inmates/lib/x86/header.S
+++ b/inmates/lib/x86/header.S
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#include <inmate.h>
diff --git a/inmates/lib/x86/hypercall.c b/inmates/lib/x86/hypercall.c

index f710376..ac99f0c 100644
--- a/inmates/lib/x86/hypercall.c
+++ b/inmates/lib/x86/hypercall.c
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#include <inmate.h>
diff --git a/inmates/lib/x86/inmate.h b/inmates/lib/x86/inmate.h

index e255538..cef3078 100644
--- a/inmates/lib/x86/inmate.h
+++ b/inmates/lib/x86/inmate.h
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#ifndef _JAILHOUSE_INMATE_H
diff --git a/inmates/lib/x86/inmate.lds b/inmates/lib/x86/inmate.lds

index de6e592..9ec0ca8 100644
--- a/inmates/lib/x86/inmate.lds
+++ b/inmates/lib/x86/inmate.lds
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

/*
diff --git a/inmates/lib/x86/int.c b/inmates/lib/x86/int.c

index 6c4335d..503f68a 100644
--- a/inmates/lib/x86/int.c
+++ b/inmates/lib/x86/int.c
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#include <inmate.h>
diff --git a/inmates/lib/x86/ioapic.c b/inmates/lib/x86/ioapic.c

index de96e21..3f1624a 100644
--- a/inmates/lib/x86/ioapic.c
+++ b/inmates/lib/x86/ioapic.c
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#include <inmate.h>
diff --git a/inmates/lib/x86/mem.c b/inmates/lib/x86/mem.c

index 3ae7aae..06a08a5 100644
--- a/inmates/lib/x86/mem.c
+++ b/inmates/lib/x86/mem.c
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#include <inmate.h>
diff --git a/inmates/lib/x86/pci.c b/inmates/lib/x86/pci.c

index 688018b..06dd193 100644
--- a/inmates/lib/x86/pci.c
+++ b/inmates/lib/x86/pci.c
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#include <inmate.h>
diff --git a/inmates/lib/x86/printk.c b/inmates/lib/x86/printk.c

index 17a2cc3..7f05b4e 100644
--- a/inmates/lib/x86/printk.c
+++ b/inmates/lib/x86/printk.c
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#include <stdarg.h>
diff --git a/inmates/lib/x86/smp.c b/inmates/lib/x86/smp.c

index accbb20..7de0065 100644
--- a/inmates/lib/x86/smp.c
+++ b/inmates/lib/x86/smp.c
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

*/

#include <inmate.h>
diff --git a/inmates/lib/x86/timing.c b/inmates/lib/x86/timing.c

index 2a0e231..9bdadae 100644
--- a/inmates/lib/x86/timing.c
+++ b/inmates/lib/x86/timing.c
@@ -8,6 +8,32 @@
*

* This work is licensed under the terms of the GNU GPL, version 2. See

* the COPYING file in the top-level directory.
+ *

Jan Kiszka

unread,

Jul 19, 2017, 1:36:35 PM7/19/17

to Claudio Scordino, Jan Kiszka, Gustavo Lima Chaves, Jailhouse, Andreas Rollbühler

Hi Claudio,

now, finally - sorry. Comments below.

That sounds good.

>
> ==============================
>
> From a167953212b218097207d4bbfed16c2e7058c4d7 Mon Sep 17 00:00:00 2001
> From: Claudio Scordino <cla...@evidence.eu.com>
> Date: Wed, 14 Jun 2017 10:36:34 +0200
> Subject: [PATCH] Provide the inmate library under BSD-2 license too.
>
> This patch does not introduce any functional change, but "only" deals
> with copyright and license aspects.
>
> The rationale is simply that, as was already stated in COPYING, cell
> inmates, AKA guests, are not derived work of Jailhouse, even if written
> exclusively to run in its special environment. The inmate library
> provides a set of functionalities to let inmates run on Jailhouse.
> In order to avoid that people need to rewrite such library, possibly
> introducing bugs or incompatibilities this way, we should rather enable
> the reuse of the "official" one. Thus, it should be provided also under a
> permissive license. BSD 2-clause is a well-established and easy-to-deal
> with license, already used for the Jailhouse headers.
>
> IMPORTANT: In order to perform these license changes, we need the
> agreement of all contributors to the affected files. So please reply to
> the individual patches with your signed-off-by line if you agree.
> The patch won't be committed until everyone involved did this.
> Please also speak up if you think you or someone else has been missed in
> this process.

This paragraph I would replace with something that states "all
contributors to the affected code have signed-off to confirm that they
agree with the relicensing" - or so.

The explanation that the patch is not applied prior to that can go to
the introductory mail.

Thanks!
Jan

Reply all

Reply to author

Forward

0 new messages