Add unique MODULE_ALIAS to non-PCI linux drivers

To help installer figure out whether there is already a vendor-provided
kernel module (with potentially different name) that should not be
clobbered it was decided that we will use unique module alias string to
identify modules.

vmsync driver will not be upstreamed (newer kernels already have the
same functionality) and so is vmblock and thus are left alone.
vmxnet, vmxnet3, pvscsi and vmci are PCI drivers and don't require
artificial aliases.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/modules/linux/vmhgfs/module.c b/open-vm-tools/modules/linux/vmhgfs/module.c
index 39a2cfaa0d423ce121803cf13061a954cd50266d..4bce943f74c2fd81349da4100351cfff44f4a5e4 100644 (file)
--- a/open-vm-tools/modules/linux/vmhgfs/module.c
+++ b/open-vm-tools/modules/linux/vmhgfs/module.c
@@ -47,6 +47,7 @@ MODULE_AUTHOR("VMware, Inc.");
 MODULE_DESCRIPTION("VMware Host/Guest File System");
 MODULE_VERSION(VMHGFS_DRIVER_VERSION_STRING);
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("vmware_vmhgfs");
 /*
  * Starting with SLE10sp2, Novell requires that IHVs sign a support agreement
  * with them and mark their kernel modules as externally supported via a

diff --git a/open-vm-tools/modules/linux/vmmemctl/os.c b/open-vm-tools/modules/linux/vmmemctl/os.c
index cc487077ee85b8ad1bd3d96ce2e2e96999259152..6b4077cf50471bf181393bb4671d3d56bd2c61e3 100644 (file)
--- a/open-vm-tools/modules/linux/vmmemctl/os.c
+++ b/open-vm-tools/modules/linux/vmmemctl/os.c
@@ -698,6 +698,7 @@ MODULE_AUTHOR("VMware, Inc.");
 MODULE_DESCRIPTION("VMware Memory Control Driver");
 MODULE_LICENSE("GPL v2");
 MODULE_VERSION(VMMEMCTL_DRIVER_VERSION_STRING);
+MODULE_ALIAS("vmware_vmmemctl");
 /*
  * Starting with SLE10sp2, Novell requires that IHVs sign a support agreement
  * with them and mark their kernel modules as externally supported via a

diff --git a/open-vm-tools/modules/linux/vsock/linux/af_vsock.c b/open-vm-tools/modules/linux/vsock/linux/af_vsock.c
index ea3fe97242cfa9ce24ef8c706032a2a70a6c718c..fb5ddee4854b75390cd51cb39a4d04b885f02aa2 100644 (file)
--- a/open-vm-tools/modules/linux/vsock/linux/af_vsock.c
+++ b/open-vm-tools/modules/linux/vsock/linux/af_vsock.c
@@ -5076,7 +5076,7 @@ MODULE_AUTHOR("VMware, Inc.");
 MODULE_DESCRIPTION("VMware Virtual Socket Family");
 MODULE_VERSION(VSOCK_DRIVER_VERSION_STRING);
 MODULE_LICENSE("GPL v2");
-
+MODULE_ALIAS("vmware_vsock");
 /*
  * Starting with SLE10sp2, Novell requires that IHVs sign a support agreement
  * with them and mark their kernel modules as externally supported via a