diff options
| author | K. Y. Srinivasan <kys@microsoft.com> | 2012-12-01 06:46:59 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-17 11:41:50 -0800 |
| commit | 3bacaf0ce106d9caca75f64a58f3b938b070df29 (patch) | |
| tree | 89924763bd639442263b37a1f623c991a9dd1163 /drivers/hv | |
| parent | 5fbebb2d2095e5c7d289d5f4ffecc2f2661c584a (diff) | |
| download | linux-stable-3bacaf0ce106d9caca75f64a58f3b938b070df29.tar.gz linux-stable-3bacaf0ce106d9caca75f64a58f3b938b070df29.tar.bz2 linux-stable-3bacaf0ce106d9caca75f64a58f3b938b070df29.zip | |
Drivers: hv: Cleanup and consolidate reporting of build/version info
Now, cleanup and consolidate reporting of host and vmbus version numbers.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hv')
| -rw-r--r-- | drivers/hv/connection.c | 11 | ||||
| -rw-r--r-- | drivers/hv/hv.c | 7 |
2 files changed, 7 insertions, 11 deletions
diff --git a/drivers/hv/connection.c b/drivers/hv/connection.c index 3965537a659d..253a74ba245c 100644 --- a/drivers/hv/connection.c +++ b/drivers/hv/connection.c @@ -120,9 +120,6 @@ static int vmbus_negotiate_version(struct vmbus_channel_msginfo *msginfo, if (msginfo->response.version_response.version_supported) { vmbus_connection.conn_state = CONNECTED; } else { - pr_err("Unable to connect, " - "Version %d not supported by Hyper-V\n", - version); return -ECONNREFUSED; } @@ -208,11 +205,17 @@ int vmbus_connect(void) goto cleanup; vmbus_proto_version = version; - pr_info("Negotiated host information %d\n", version); + pr_info("Hyper-V Host Build:%d-%d.%d-%d-%d.%d; Vmbus version:%d.%d\n", + host_info_eax, host_info_ebx >> 16, + host_info_ebx & 0xFFFF, host_info_ecx, + host_info_edx >> 24, host_info_edx & 0xFFFFFF, + version >> 16, version & 0xFFFF); + kfree(msginfo); return 0; cleanup: + pr_err("Unable to connect to host\n"); vmbus_connection.conn_state = DISCONNECTED; if (vmbus_connection.work_queue) diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c index 0cd2da3b22f5..1c5481da6e4a 100644 --- a/drivers/hv/hv.c +++ b/drivers/hv/hv.c @@ -74,13 +74,6 @@ static int query_hypervisor_info(void) edx = 0; op = HVCPUID_VERSION; cpuid(op, &eax, &ebx, &ecx, &edx); - pr_info("Hyper-V Host OS Build:%d-%d.%d-%d-%d.%d\n", - eax, - ebx >> 16, - ebx & 0xFFFF, - ecx, - edx >> 24, - edx & 0xFFFFFF); host_info_eax = eax; host_info_ebx = ebx; host_info_ecx = ecx; |