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>

diff --git a/drivers/hv/connection.c b/drivers/hv/connection.c
index 3965537a659dee9c28228d88471216fd2ff27699..253a74ba245cb0011706f1644fca674f67a52441 100644 (file)
--- 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 0cd2da3b22f5db2ad3c8c722a2daa5368bf262c0..1c5481da6e4ad7bcae9bf75844d239231050d799 100644 (file)
--- 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;