[PATCH 1/3] Make virtio modules GPL

[PATCH 1/3] Make virtio modules GPL

[Anthony Liguori]

The virtio modules do not advertise themselves as GPL but rely on exported
GPL symbols.  This makes them unloadable as modules.

This patch adds the appropriate MODULE_LICENSE().

Signed-off: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 54a8017..8f6040d 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -8,6 +8,8 @@
 
 #define VIRTIO_MAX_SG	(3+MAX_PHYS_SEGMENTS)
 
+MODULE_LICENSE("GPL");
+
 static unsigned char virtblk_index = 'a';
 struct virtio_blk
 {
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index ebe4b03..9789e68 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -28,6 +28,8 @@
 static int napi_weight = 128;
 module_param(napi_weight, int, 0444);
 
+MODULE_LICENSE("GPL");
+
 /* FIXME: MTU in config. */
 #define MAX_PACKET_LEN (ETH_HLEN+ETH_DATA_LEN)
 
diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
index 646f716..6e27c08 100644
--- a/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
@@ -2,6 +2,8 @@
 #include <linux/spinlock.h>
 #include <linux/virtio_config.h>
 
+MODULE_LICENSE("GPL");
+
 static ssize_t device_show(struct device *_d,
 			   struct device_attribute *attr, char *buf)
 {
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 951e4c7..15ee2fa 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -20,6 +20,8 @@
 #include <linux/virtio_ring.h>
 #include <linux/device.h>
 
+MODULE_LICENSE("GPL");
+
 #ifdef DEBUG
 /* For development, we want to crash whenever the ring is screwed. */
 #define BAD_RING(vq, fmt...)			\

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

[PATCH 2/3] Make virtio_pci license be GPL2+

[Anthony Liguori]

This patch changes the virtio_pci license to be GPL2 or later.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index 45ff193..f8df571 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -9,8 +9,8 @@
  * Authors:
  *  Anthony Liguori  <aliguori@us.ibm.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 or later.
+ * See the COPYING file in the top-level directory.
  *
  */
 
diff --git a/include/linux/virtio_pci.h b/include/linux/virtio_pci.h
index 4b28409..82f22cd 100644
--- a/include/linux/virtio_pci.h
+++ b/include/linux/virtio_pci.h
@@ -9,8 +9,8 @@
  * Authors:
  *  Anthony Liguori  <aliguori@us.ibm.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 or later.
+ * See the COPYING file in the top-level directory.
  *
  */

[PATCH 3/3] Use Qumranet donated PCI vendor/device IDs

[Anthony Liguori]

Qumranet was kind enough to donate a set of vendor/device IDs for virtio
devices.  This patch switches over to using them instead of an unreserved
vendor ID.

Signed-off-by: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>

diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index f8df571..36b810d 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -64,7 +64,8 @@ struct virtio_pci_vq_info
 
 /* We have to enumerate here all virtio PCI devices. */
 static struct pci_device_id virtio_pci_id_table[] = {
-	{ 0x5002, 0x2258, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* Dummy entry */
+	{ 0x1af4, 0x1000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* virtio net */
+	{ 0x1af4, 0x1001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* virtio blk */
 	{ 0 },
 };
 

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

Re: [PATCH 1/3] Make virtio modules GPL

[Dong, Eddie]

[-- Attachment #1: Type: text/plain, Size: 2790 bytes --]

Curuious: should we consider it to be dual licensed from beginning?
thx,eddie

>-----Original Message-----
>From: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org 
>[mailto:kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org] On Behalf Of 
>Anthony Liguori
>Sent: 2008年1月3日 5:02
>To: virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
>Cc: kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
>Subject: [kvm-devel] [PATCH 1/3] Make virtio modules GPL
>
>The virtio modules do not advertise themselves as GPL but rely 
>on exported
>GPL symbols.  This makes them unloadable as modules.
>
>This patch adds the appropriate MODULE_LICENSE().
>
>Signed-off: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
>
>diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
>index 54a8017..8f6040d 100644
>--- a/drivers/block/virtio_blk.c
>+++ b/drivers/block/virtio_blk.c
>@@ -8,6 +8,8 @@
> 
> #define VIRTIO_MAX_SG	(3+MAX_PHYS_SEGMENTS)
> 
>+MODULE_LICENSE("GPL");
>+
> static unsigned char virtblk_index = 'a';
> struct virtio_blk
> {
>diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
>index ebe4b03..9789e68 100644
>--- a/drivers/net/virtio_net.c
>+++ b/drivers/net/virtio_net.c
>@@ -28,6 +28,8 @@
> static int napi_weight = 128;
> module_param(napi_weight, int, 0444);
> 
>+MODULE_LICENSE("GPL");
>+
> /* FIXME: MTU in config. */
> #define MAX_PACKET_LEN (ETH_HLEN+ETH_DATA_LEN)
> 
>diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
>index 646f716..6e27c08 100644
>--- a/drivers/virtio/virtio.c
>+++ b/drivers/virtio/virtio.c
>@@ -2,6 +2,8 @@
> #include <linux/spinlock.h>
> #include <linux/virtio_config.h>
> 
>+MODULE_LICENSE("GPL");
>+
> static ssize_t device_show(struct device *_d,
> 			   struct device_attribute *attr, char *buf)
> {
>diff --git a/drivers/virtio/virtio_ring.c 
>b/drivers/virtio/virtio_ring.c
>index 951e4c7..15ee2fa 100644
>--- a/drivers/virtio/virtio_ring.c
>+++ b/drivers/virtio/virtio_ring.c
>@@ -20,6 +20,8 @@
> #include <linux/virtio_ring.h>
> #include <linux/device.h>
> 
>+MODULE_LICENSE("GPL");
>+
> #ifdef DEBUG
> /* For development, we want to crash whenever the ring is screwed. */
> #define BAD_RING(vq, fmt...)			\
>
>---------------------------------------------------------------
>----------
>This SF.net email is sponsored by: Microsoft
>Defy all challenges. Microsoft(R) Visual Studio 2005.
>http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
>_______________________________________________
>kvm-devel mailing list
>kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
>https://lists.sourceforge.net/lists/listinfo/kvm-devel
>


[-- Attachment #2: Type: text/plain, Size: 228 bytes --]

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

[-- Attachment #3: Type: text/plain, Size: 186 bytes --]

_______________________________________________
kvm-devel mailing list
kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
https://lists.sourceforge.net/lists/listinfo/kvm-devel

Re: [PATCH 3/3] Use Qumranet donated PCI vendor/device IDs

[Rusty Russell]

On Thursday 03 January 2008 08:01:34 Anthony Liguori wrote:
> Qumranet was kind enough to donate a set of vendor/device IDs for virtio
> devices.  This patch switches over to using them instead of an unreserved
> vendor ID.
>
> Signed-off-by: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>

All applied, thanks!

Rusty.

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

Re: [PATCH 1/3] Make virtio modules GPL

[Anthony Liguori]

[-- Attachment #1: Type: text/plain, Size: 3123 bytes --]

Dong, Eddie wrote:
> Curuious: should we consider it to be dual licensed from beginning?
>   

AFAIK, they are GPLv2+. I think Rusty was talking about dual licensing
the headers. He'll have to comment on that though.

Regards,

Anthony Liguori

> thx,eddie
>
>   
>> -----Original Message-----
>> From: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org 
>> [mailto:kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org] On Behalf Of 
>> Anthony Liguori
>> Sent: 2008年1月3日 5:02
>> To: virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
>> Cc: kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
>> Subject: [kvm-devel] [PATCH 1/3] Make virtio modules GPL
>>
>> The virtio modules do not advertise themselves as GPL but rely 
>> on exported
>> GPL symbols.  This makes them unloadable as modules.
>>
>> This patch adds the appropriate MODULE_LICENSE().
>>
>> Signed-off: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
>>
>> diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
>> index 54a8017..8f6040d 100644
>> --- a/drivers/block/virtio_blk.c
>> +++ b/drivers/block/virtio_blk.c
>> @@ -8,6 +8,8 @@
>>
>> #define VIRTIO_MAX_SG	(3+MAX_PHYS_SEGMENTS)
>>
>> +MODULE_LICENSE("GPL");
>> +
>> static unsigned char virtblk_index = 'a';
>> struct virtio_blk
>> {
>> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
>> index ebe4b03..9789e68 100644
>> --- a/drivers/net/virtio_net.c
>> +++ b/drivers/net/virtio_net.c
>> @@ -28,6 +28,8 @@
>> static int napi_weight = 128;
>> module_param(napi_weight, int, 0444);
>>
>> +MODULE_LICENSE("GPL");
>> +
>> /* FIXME: MTU in config. */
>> #define MAX_PACKET_LEN (ETH_HLEN+ETH_DATA_LEN)
>>
>> diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
>> index 646f716..6e27c08 100644
>> --- a/drivers/virtio/virtio.c
>> +++ b/drivers/virtio/virtio.c
>> @@ -2,6 +2,8 @@
>> #include <linux/spinlock.h>
>> #include <linux/virtio_config.h>
>>
>> +MODULE_LICENSE("GPL");
>> +
>> static ssize_t device_show(struct device *_d,
>> 			   struct device_attribute *attr, char *buf)
>> {
>> diff --git a/drivers/virtio/virtio_ring.c 
>> b/drivers/virtio/virtio_ring.c
>> index 951e4c7..15ee2fa 100644
>> --- a/drivers/virtio/virtio_ring.c
>> +++ b/drivers/virtio/virtio_ring.c
>> @@ -20,6 +20,8 @@
>> #include <linux/virtio_ring.h>
>> #include <linux/device.h>
>>
>> +MODULE_LICENSE("GPL");
>> +
>> #ifdef DEBUG
>> /* For development, we want to crash whenever the ring is screwed. */
>> #define BAD_RING(vq, fmt...)			\
>>
>> ---------------------------------------------------------------
>> ----------
>> This SF.net email is sponsored by: Microsoft
>> Defy all challenges. Microsoft(R) Visual Studio 2005.
>> http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
>> _______________________________________________
>> kvm-devel mailing list
>> kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
>> https://lists.sourceforge.net/lists/listinfo/kvm-devel
>>
>>     



[-- Attachment #2: Type: text/plain, Size: 228 bytes --]

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

[-- Attachment #3: Type: text/plain, Size: 186 bytes --]

_______________________________________________
kvm-devel mailing list
kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
https://lists.sourceforge.net/lists/listinfo/kvm-devel

Re: [PATCH 1/3] Make virtio modules GPL

[Rusty Russell]

On Thursday 03 January 2008 08:01:32 Anthony Liguori wrote:
> The virtio modules do not advertise themselves as GPL but rely on exported
> GPL symbols.  This makes them unloadable as modules.
>
> This patch adds the appropriate MODULE_LICENSE().

Hmm, this is already at the bottom of virtio_blk and virtio_net.  I moved the 
others to the bottom too.

Cheers,
Rusty.

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/