Skip to contentSkip to conversation

Drivers: hv: remove HV_DRV_VERSION

PATCH In review Olaf Hering 3 participants 4 messages May 29, 2013 – Jul 25, 2013

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Drivers: hv: remove HV_DRV_VERSION

Remove HV_DRV_VERSION, it has no meaning for upstream drivers.

Initially it was supposed to show the "Linux Integration Services" version, now it is not in sync anymore with the out-of-tree drivers available from the MSFT website.

The only place where a version string is still required is the KVP command "IntegrationServicesVersion" which is handled by tools/hv/hv_kvp_daemon.c. To satisfy such KVP request from the host pass the current string to the daemon during KVP userland registration.

---
 drivers/hid/hid-hyperv.c        |  1 -
 drivers/hv/hv_balloon.c         |  1 -
 drivers/hv/hv_kvp.c             |  2 ++
 drivers/hv/hv_util.c            |  1 -
 drivers/hv/vmbus_drv.c          |  1 -
 drivers/net/hyperv/netvsc_drv.c |  2 --
 drivers/scsi/storvsc_drv.c      |  1 -
 drivers/video/hyperv_fb.c       |  1 -
 include/linux/hyperv.h          | 21 ---------------------
 9 files changed, 2 insertions(+), 29 deletions(-)
drivers/hid/hid-hyperv.c +0 -1
index aa3fec0..05f3e96 100644
@@ -592,6 +592,5 @@ static void __exit mousevsc_exit(void)
 }
 
 MODULE_LICENSE("GPL");
-MODULE_VERSION(HV_DRV_VERSION);
 module_init(mousevsc_init);
 module_exit(mousevsc_exit);
drivers/hv/hv_balloon.c +0 -1
index 4c605c7..c4b50a5 100644
@@ -1521,5 +1521,4 @@ static int __init init_balloon_drv(void)
 module_init(init_balloon_drv);
 
 MODULE_DESCRIPTION("Hyper-V Balloon");
-MODULE_VERSION(HV_DRV_VERSION);
 MODULE_LICENSE("GPL");
drivers/hv/hv_kvp.c +2 -0
index ed50e9e..296c16e 100644
@@ -76,7 +76,9 @@ static u8 *recv_buffer;
 /*
  * Register the kernel component with the user-level daemon.
  * As part of this registration, pass the LIC version number.
+ * This number has no meaning, it satisfies the registration protocol.
  */
+#define HV_DRV_VERSION           "3.1"
 
 static void
 kvp_register(int reg_value)
drivers/hv/hv_util.c +0 -1
index 2f561c5..c59cc8b 100644
@@ -380,5 +380,4 @@ module_init(init_hyperv_utils);
 module_exit(exit_hyperv_utils);
 
 MODULE_DESCRIPTION("Hyper-V Utilities");
-MODULE_VERSION(HV_DRV_VERSION);
 MODULE_LICENSE("GPL");
drivers/hv/vmbus_drv.c +0 -1
index bf421e0..7ef9585 100644
@@ -812,7 +812,6 @@ static void __exit vmbus_exit(void)
 
 
 MODULE_LICENSE("GPL");
-MODULE_VERSION(HV_DRV_VERSION);
 
 subsys_initcall(hv_acpi_init);
 module_exit(vmbus_exit);
drivers/net/hyperv/netvsc_drv.c +0 -2
index 088c554..e50ca64 100644
@@ -303,7 +303,6 @@ static void netvsc_get_drvinfo(struct net_device *net,
 			       struct ethtool_drvinfo *info)
 {
 	strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
-	strlcpy(info->version, HV_DRV_VERSION, sizeof(info->version));
 	strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));
 }
 
@@ -526,7 +525,6 @@ static int __init netvsc_drv_init(void)
 }
 
 MODULE_LICENSE("GPL");
-MODULE_VERSION(HV_DRV_VERSION);
 MODULE_DESCRIPTION("Microsoft Hyper-V network driver");
 
 module_init(netvsc_drv_init);
drivers/scsi/storvsc_drv.c +0 -1
index 16a3a0c..1a720cf 100644
@@ -1610,7 +1610,6 @@ static void __exit storvsc_drv_exit(void)
 }
 
 MODULE_LICENSE("GPL");
-MODULE_VERSION(HV_DRV_VERSION);
 MODULE_DESCRIPTION("Microsoft Hyper-V virtual storage driver");
 module_init(storvsc_drv_init);
 module_exit(storvsc_drv_exit);
drivers/video/hyperv_fb.c +0 -1
index d4d2c5f..8ac99b8 100644
@@ -825,5 +825,4 @@ module_init(hvfb_drv_init);
 module_exit(hvfb_drv_exit);
 
 MODULE_LICENSE("GPL");
-MODULE_VERSION(HV_DRV_VERSION);
 MODULE_DESCRIPTION("Microsoft Hyper-V Synthetic Video Frame Buffer Driver");
include/linux/hyperv.h +0 -21
index c255984..e294ad7 100644
@@ -455,27 +455,6 @@ hv_get_ringbuffer_availbytes(struct hv_ring_buffer_info *rbi,
 	*read = dsize - *write;
 }
 
-
-/*
- * We use the same version numbering for all Hyper-V modules.
- *
- * Definition of versioning is as follows;
- *
- *	Major Number	Changes for these scenarios;
- *			1.	When a new version of Windows Hyper-V
- *				is released.
- *			2.	A Major change has occurred in the
- *				Linux IC's.
- *			(For example the merge for the first time
- *			into the kernel) Every time the Major Number
- *			changes, the Revision number is reset to 0.
- *	Minor Number	Changes when new functionality is added
- *			to the Linux IC's that is not a bug fix.
- *
- * 3.1 - Added completed hv_utils driver. Shutdown/Heartbeat/Timesync
- */
-#define HV_DRV_VERSION           "3.1"
-
 /*
  * VMBUS version is 32 bit entity broken up into
  * two 16 bit quantities: major_number. minor_number.
#1 lore raw
Quoted 12 lines · Olaf Hering

Remove HV_DRV_VERSION, it has no meaning for upstream drivers.

Initially it was supposed to show the "Linux Integration Services" version, now it is not in sync anymore with the out-of-tree drivers available from the MSFT website.

The only place where a version string is still required is the KVP command "IntegrationServicesVersion" which is handled by tools/hv/hv_kvp_daemon.c. To satisfy such KVP request from the host pass the current string to the daemon during KVP userland registration.

Quoted 11 lines
---
 drivers/hid/hid-hyperv.c        |  1 -
 drivers/hv/hv_balloon.c         |  1 -
 drivers/hv/hv_kvp.c             |  2 ++
 drivers/hv/hv_util.c            |  1 -
 drivers/hv/vmbus_drv.c          |  1 -
 drivers/net/hyperv/netvsc_drv.c |  2 --
 drivers/scsi/storvsc_drv.c      |  1 -
 drivers/video/hyperv_fb.c       |  1 -
 include/linux/hyperv.h          | 21 ---------------------
 9 files changed, 2 insertions(+), 29 deletions(-)

KY, what happened to this patch? Any ack/nak for it?

thanks,

greg k-h

Acked-by
#2 lore raw
Quoted 22 lines

-----Original Message-----
From: Greg KH [mailto:[email protected]]
Sent: Thursday, July 25, 2013 1:10 AM
To: Olaf Hering
Cc: KY Srinivasan; [email protected]
Subject: Re: [PATCH] Drivers: hv: remove HV_DRV_VERSION

Quoted 12 lines · Olaf Hering

Remove HV_DRV_VERSION, it has no meaning for upstream drivers.

Initially it was supposed to show the "Linux Integration Services" version, now it is not in sync anymore with the out-of-tree drivers available from the MSFT website.

The only place where a version string is still required is the KVP command "IntegrationServicesVersion" which is handled by tools/hv/hv_kvp_daemon.c. To satisfy such KVP request from the host pass the current string to the daemon during KVP userland registration.

Quoted 19 lines
Quoted 11 lines
---
 drivers/hid/hid-hyperv.c        |  1 -
 drivers/hv/hv_balloon.c         |  1 -
 drivers/hv/hv_kvp.c             |  2 ++
 drivers/hv/hv_util.c            |  1 -
 drivers/hv/vmbus_drv.c          |  1 -
 drivers/net/hyperv/netvsc_drv.c |  2 --
 drivers/scsi/storvsc_drv.c      |  1 -
 drivers/video/hyperv_fb.c       |  1 -
 include/linux/hyperv.h          | 21 ---------------------
 9 files changed, 2 insertions(+), 29 deletions(-)

KY, what happened to this patch? Any ack/nak for it?

thanks,

greg k-h

Acked-by on v1 1/1
#3 lore raw
In reply to Olaf Hering
Quoted 15 lines

-----Original Message-----
From: Olaf Hering [mailto:[email protected]]
Sent: Wednesday, May 29, 2013 5:29 AM
To: KY Srinivasan; [email protected]
Cc: [email protected]; Olaf Hering
Subject: [PATCH] Drivers: hv: remove HV_DRV_VERSION

Remove HV_DRV_VERSION, it has no meaning for upstream drivers.

Initially it was supposed to show the "Linux Integration Services" version, now it is not in sync anymore with the out-of-tree drivers available from the MSFT website.

Quoted 6 lines

The only place where a version string is still required is the KVP command "IntegrationServicesVersion" which is handled by tools/hv/hv_kvp_daemon.c. To satisfy such KVP request from the host pass the current string to the daemon during KVP userland registration.

Quoted 146 lines
---
 drivers/hid/hid-hyperv.c        |  1 -
 drivers/hv/hv_balloon.c         |  1 -
 drivers/hv/hv_kvp.c             |  2 ++
 drivers/hv/hv_util.c            |  1 -
 drivers/hv/vmbus_drv.c          |  1 -
 drivers/net/hyperv/netvsc_drv.c |  2 --
 drivers/scsi/storvsc_drv.c      |  1 -
 drivers/video/hyperv_fb.c       |  1 -
 include/linux/hyperv.h          | 21 ---------------------
 9 files changed, 2 insertions(+), 29 deletions(-)
drivers/hid/hid-hyperv.c +0 -1
index aa3fec0..05f3e96 100644
@@ -592,6 +592,5 @@ static void __exit mousevsc_exit(void)
 }
 
 MODULE_LICENSE("GPL");
-MODULE_VERSION(HV_DRV_VERSION);
 module_init(mousevsc_init);
 module_exit(mousevsc_exit);
drivers/hv/hv_balloon.c +0 -1
index 4c605c7..c4b50a5 100644
@@ -1521,5 +1521,4 @@ static int __init init_balloon_drv(void)
 module_init(init_balloon_drv);
 
 MODULE_DESCRIPTION("Hyper-V Balloon");
-MODULE_VERSION(HV_DRV_VERSION);
 MODULE_LICENSE("GPL");
drivers/hv/hv_kvp.c +2 -0
index ed50e9e..296c16e 100644
@@ -76,7 +76,9 @@ static u8 *recv_buffer;
 /*
  * Register the kernel component with the user-level daemon.
  * As part of this registration, pass the LIC version number.
+ * This number has no meaning, it satisfies the registration protocol.
  */
+#define HV_DRV_VERSION           "3.1"
 
 static void
 kvp_register(int reg_value)
drivers/hv/hv_util.c +0 -1
index 2f561c5..c59cc8b 100644
@@ -380,5 +380,4 @@ module_init(init_hyperv_utils);
 module_exit(exit_hyperv_utils);
 
 MODULE_DESCRIPTION("Hyper-V Utilities");
-MODULE_VERSION(HV_DRV_VERSION);
 MODULE_LICENSE("GPL");
drivers/hv/vmbus_drv.c +0 -1
index bf421e0..7ef9585 100644
@@ -812,7 +812,6 @@ static void __exit vmbus_exit(void)
 
 
 MODULE_LICENSE("GPL");
-MODULE_VERSION(HV_DRV_VERSION);
 
 subsys_initcall(hv_acpi_init);
 module_exit(vmbus_exit);
drivers/net/hyperv/netvsc_drv.c +0 -2
index 088c554..e50ca64 100644
@@ -303,7 +303,6 @@ static void netvsc_get_drvinfo(struct net_device *net,
 			       struct ethtool_drvinfo *info)
 {
 	strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
-	strlcpy(info->version, HV_DRV_VERSION, sizeof(info->version));
 	strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));
 }
 
@@ -526,7 +525,6 @@ static int __init netvsc_drv_init(void)
 }
 
 MODULE_LICENSE("GPL");
-MODULE_VERSION(HV_DRV_VERSION);
 MODULE_DESCRIPTION("Microsoft Hyper-V network driver");
 
 module_init(netvsc_drv_init);
drivers/scsi/storvsc_drv.c +0 -1
index 16a3a0c..1a720cf 100644
@@ -1610,7 +1610,6 @@ static void __exit storvsc_drv_exit(void)
 }
 
 MODULE_LICENSE("GPL");
-MODULE_VERSION(HV_DRV_VERSION);
 MODULE_DESCRIPTION("Microsoft Hyper-V virtual storage driver");
 module_init(storvsc_drv_init);
 module_exit(storvsc_drv_exit);
drivers/video/hyperv_fb.c +0 -1
index d4d2c5f..8ac99b8 100644
@@ -825,5 +825,4 @@ module_init(hvfb_drv_init);
 module_exit(hvfb_drv_exit);
 
 MODULE_LICENSE("GPL");
-MODULE_VERSION(HV_DRV_VERSION);
 MODULE_DESCRIPTION("Microsoft Hyper-V Synthetic Video Frame Buffer

Driver");

include/linux/hyperv.h +0 -21
index c255984..e294ad7 100644
@@ -455,27 +455,6 @@ hv_get_ringbuffer_availbytes(struct
 hv_ring_buffer_info *rbi,
 	*read = dsize - *write;
 }
 
-
-/*
- * We use the same version numbering for all Hyper-V modules.
- *
- * Definition of versioning is as follows;
- *
- *	Major Number	Changes for these scenarios;
- *			1.	When a new version of Windows Hyper-V
- *				is released.
- *			2.	A Major change has occurred in the
- *				Linux IC's.
- *			(For example the merge for the first time
- *			into the kernel) Every time the Major Number
- *			changes, the Revision number is reset to 0.
- *	Minor Number	Changes when new functionality is added
- *			to the Linux IC's that is not a bug fix.
- *
- * 3.1 - Added completed hv_utils driver. Shutdown/Heartbeat/Timesync
- */
-#define HV_DRV_VERSION           "3.1"
-
 /*
  * VMBUS version is 32 bit entity broken up into

* two 16 bit quantities: major_number. minor_number.