MFC 303066-303072,303127-303129,303131

303066
    hyperv/vmbus: Get rid of unnecessary definition.

    Sponsored by:   Microsoft OSTC
    Differential Revision:  https://reviews.freebsd.org/D7240

303067
    hyperv/vmbus: Move IC register definition to Hyper-V utilities

    Sponsored by:   Microsoft OSTC
    Differential Revision:  https://reviews.freebsd.org/D7241

303068
    hyperv/vmbus: Channel struct field rename

    Sponsored by:   Microsoft OSTC
    Differential Revision:  https://reviews.freebsd.org/D7242

303069
    hyperv/vmbus: Pass channel as the first argument for channel callback

    The prepares to kill device private fields in channel struct, which
    are not flexible and extensible.

    Sponsored by:   Microsoft OSTC
    Differential Revision:  https://reviews.freebsd.org/D7243

303070
    hyperv/vmbus: Deprecate the device private data in channel struct

    They are neither flexible nor extensible.

    Sponsored by:   Microsoft OSTC
    Differential Revision:  https://reviews.freebsd.org/D7244

303071
    hyperv/vmbus: Hide channel struct definition.

    Sponsored by:   Microsoft OSTC
    Differential Revision:  https://reviews.freebsd.org/D7245

303072
    hyperv/vmbus: Save MNF trigger location instead of MNF trigger index.

    Sponsored by:   Microsoft OSTC
    Differential Revision:  https://reviews.freebsd.org/D7246

303127
    hyperv/vmbus: Save event flag location and evet flag mask.

    This avoids unnecessary access to the vmbus_softc struct on sending path.

    Sponsored by:   Microsoft OSTC
    Differential Revision:  https://reviews.freebsd.org/D7257

303128
    hyperv/vmbus: Reorder channel fields.

    Sponsored by:   Microsoft OSTC
    Differential Revision:  https://reviews.freebsd.org/D7258

303129
    hyperv/vmbus: Shuffle function declaration and macro definition.

    Sponsored by:   Microsoft OSTC
    Differential Revision:  https://reviews.freebsd.org/D7259

303131
    hyperv: hv_vmbus_channel -> vmbus_channel

    Sponsored by:   Microsoft OSTC
    Differential Revision:  https://reviews.freebsd.org/D7260

1 files changed, 2 insertions, 3 deletions

diff --git a/sys/dev/hyperv/utilities/hv_shutdown.c b/sys/dev/hyperv/utilities/hv_shutdown.c
index 9c64a85..521b2da 100644
--- a/sys/dev/hyperv/utilities/hv_shutdown.c
+++ b/sys/dev/hyperv/utilities/hv_shutdown.c
@@ -41,6 +41,7 @@
 
 #include <dev/hyperv/include/hyperv.h>
 #include <dev/hyperv/include/vmbus.h>
+#include <dev/hyperv/utilities/hv_utilreg.h>
 #include "hv_util.h"
 #include "vmbus_if.h"
 
@@ -52,10 +53,9 @@ static const struct hyperv_guid service_guid = { .hv_guid =
  * Shutdown
  */
 static void
-hv_shutdown_cb(void *context)
+hv_shutdown_cb(struct vmbus_channel *channel, void *context)
 {
 	uint8_t*			buf;
-	hv_vmbus_channel*		channel;
 	uint8_t				execute_shutdown = 0;
 	hv_vmbus_icmsg_hdr*		icmsghdrp;
 	uint32_t			recv_len;
@@ -66,7 +66,6 @@ hv_shutdown_cb(void *context)
 
 	softc = (hv_util_sc*)context;
 	buf = softc->receive_buffer;
-	channel = softc->channel;
 
 	recv_len = PAGE_SIZE;
 	ret = vmbus_chan_recv(channel, buf, &recv_len, &request_id);