diff options
| author | Philip Langdale <philipl@fido2.homeip.net> | 2007-09-10 21:16:04 -0700 |
|---|---|---|
| committer | Philip Langdale <philipl@fido2.homeip.net> | 2007-09-10 21:16:04 -0700 |
| commit | e41aef1fb187c1b450fbea0163eb16e0c40f0435 (patch) | |
| tree | 000d95806d19f11b1099a56dc039bae3af46c40b | |
| parent | 2331c7d1629f9841c02cf907ef4fa8b679cc5141 (diff) | |
Ready 10.15.1 release.
To allow for easier detection of driver version by other VMware tools,
we are embedding the version in a .modinfo section so that the Linux
kernel 'modinfo' tool can be (ab)used to check it.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/vmware.c | 18 |
2 files changed, 15 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 725555b..02b615e 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-vmware], - 10.15.0, + 10.15.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-vmware) diff --git a/src/vmware.c b/src/vmware.c index e02e2fa..3db8029 100644 --- a/src/vmware.c +++ b/src/vmware.c @@ -83,13 +83,23 @@ char rcsId_vmware[] = #define VMWARE_DRIVER_NAME "vmware" #define VMWARE_MAJOR_VERSION 10 #define VMWARE_MINOR_VERSION 15 -#define VMWARE_PATCHLEVEL 0 +#define VMWARE_PATCHLEVEL 1 #define VMWARE_DRIVER_VERSION \ (VMWARE_MAJOR_VERSION * 65536 + VMWARE_MINOR_VERSION * 256 + VMWARE_PATCHLEVEL) +#define VMWARE_DRIVER_VERSION_STRING \ + VMW_STRING(VMWARE_MAJOR_VERSION) "." VMW_STRING(VMWARE_MINOR_VERSION) \ + "." VMW_STRING(VMWARE_PATCHLEVEL) -static const char VMWAREBuildStr[] = "VMware Guest X Server " - VMW_STRING(VMWARE_MAJOR_VERSION) "." VMW_STRING(VMWARE_MINOR_VERSION) - "." VMW_STRING(VMWARE_PATCHLEVEL) " - build=$Name$\n"; +static const char VMWAREBuildStr[] = "VMware Guest X Server " + VMWARE_DRIVER_VERSION_STRING " - build=$Name$\n"; + +/* + * Standard four digit version string expected by VMware Tools installer. + * As the driver's version is only {major, minor, patchlevel}, simply append an + * extra zero for the fourth digit. + */ +const char vm_version[] __attribute__((section(".modinfo"),unused)) = + "version=" VMWARE_DRIVER_VERSION_STRING ".0"; static SymTabRec VMWAREChipsets[] = { { PCI_CHIP_VMWARE0405, "vmware0405" }, |