diff --git a/[refs] b/[refs] index fae7642bb61a..3655778e7010 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dec317fd6accfdba4daff13aa4d9f5abde02b347 +refs/heads/master: e54bbc6471d7f788d829e5f3b5922960048fbff7 diff --git a/trunk/drivers/staging/hv/tools/hv_kvp_daemon.c b/trunk/drivers/staging/hv/tools/hv_kvp_daemon.c index 8fd0f2ba57b4..c4cf988ad5cb 100644 --- a/trunk/drivers/staging/hv/tools/hv_kvp_daemon.c +++ b/trunk/drivers/staging/hv/tools/hv_kvp_daemon.c @@ -118,6 +118,15 @@ void kvp_get_os_info(void) os_build = uts_buf.release; processor_arch = uts_buf.machine; + /* + * The current windows host (win7) expects the build + * string to be of the form: x.y.z + * Strip additional information we may have. + */ + p = strchr(os_build, '-'); + if (p) + *p = '\0'; + file = fopen("/etc/SuSE-release", "r"); if (file != NULL) goto kvp_osinfo_found;