Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bacaf0c authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman
Browse files

Drivers: hv: Cleanup and consolidate reporting of build/version info 



Now, cleanup and consolidate reporting of host and vmbus version numbers.

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Reviewed-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5fbebb2d

drivers/hv/connection.c

+7 −4
Original line number Diff line number Diff line
@@ -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)

drivers/hv/hv.c

+0 −7
Original line number Diff line number Diff line
@@ -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;