diff options
-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, | |||
120 | if (msginfo->response.version_response.version_supported) { | 120 | if (msginfo->response.version_response.version_supported) { |
121 | vmbus_connection.conn_state = CONNECTED; | 121 | vmbus_connection.conn_state = CONNECTED; |
122 | } else { | 122 | } else { |
123 | pr_err("Unable to connect, " | ||
124 | "Version %d not supported by Hyper-V\n", | ||
125 | version); | ||
126 | return -ECONNREFUSED; | 123 | return -ECONNREFUSED; |
127 | } | 124 | } |
128 | 125 | ||
@@ -208,11 +205,17 @@ int vmbus_connect(void) | |||
208 | goto cleanup; | 205 | goto cleanup; |
209 | 206 | ||
210 | vmbus_proto_version = version; | 207 | vmbus_proto_version = version; |
211 | pr_info("Negotiated host information %d\n", version); | 208 | pr_info("Hyper-V Host Build:%d-%d.%d-%d-%d.%d; Vmbus version:%d.%d\n", |
209 | host_info_eax, host_info_ebx >> 16, | ||
210 | host_info_ebx & 0xFFFF, host_info_ecx, | ||
211 | host_info_edx >> 24, host_info_edx & 0xFFFFFF, | ||
212 | version >> 16, version & 0xFFFF); | ||
213 | |||
212 | kfree(msginfo); | 214 | kfree(msginfo); |
213 | return 0; | 215 | return 0; |
214 | 216 | ||
215 | cleanup: | 217 | cleanup: |
218 | pr_err("Unable to connect to host\n"); | ||
216 | vmbus_connection.conn_state = DISCONNECTED; | 219 | vmbus_connection.conn_state = DISCONNECTED; |
217 | 220 | ||
218 | if (vmbus_connection.work_queue) | 221 | 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) | |||
74 | edx = 0; | 74 | edx = 0; |
75 | op = HVCPUID_VERSION; | 75 | op = HVCPUID_VERSION; |
76 | cpuid(op, &eax, &ebx, &ecx, &edx); | 76 | cpuid(op, &eax, &ebx, &ecx, &edx); |
77 | pr_info("Hyper-V Host OS Build:%d-%d.%d-%d-%d.%d\n", | ||
78 | eax, | ||
79 | ebx >> 16, | ||
80 | ebx & 0xFFFF, | ||
81 | ecx, | ||
82 | edx >> 24, | ||
83 | edx & 0xFFFFFF); | ||
84 | host_info_eax = eax; | 77 | host_info_eax = eax; |
85 | host_info_ebx = ebx; | 78 | host_info_ebx = ebx; |
86 | host_info_ecx = ecx; | 79 | host_info_ecx = ecx; |