From: VMware, Inc <>
Date: Tue, 17 Nov 2009 21:25:23 +0000 (-0800)
Subject: Add unique MODULE_ALIAS to non-PCI linux drivers
X-Git-Tag: 2009.11.16-210370~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff5b73e4b69c18b1e54c646a3079d41b9cd85293;p=thirdparty%2Fopen-vm-tools.git

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 39a2cfaa0..4bce943f7 100644
--- 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 cc487077e..6b4077cf5 100644
--- 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 ea3fe9724..fb5ddee48 100644
--- 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