diff options
| author | sephe <sephe@FreeBSD.org> | 2016-10-13 01:43:15 +0000 |
|---|---|---|
| committer | sephe <sephe@FreeBSD.org> | 2016-10-13 01:43:15 +0000 |
| commit | 77f1bb908895d8de1488000f873da71fbdf25d25 (patch) | |
| tree | 2b37086e7451faf61ac4e5270e7b14fd8aae2dda /sys/dev/hyperv/utilities/hv_shutdown.c | |
| parent | cec90d75d1d83dbec8e8e6fb5a3446ef4e085236 (diff) | |
| download | FreeBSD-src-77f1bb908895d8de1488000f873da71fbdf25d25.zip FreeBSD-src-77f1bb908895d8de1488000f873da71fbdf25d25.tar.gz | |
MFC 303822-303824
303822
hyperv/ic: Remove never used second parameter of hv_negotiate_version()
Sponsored by: Microsoft
Differential Revision: https://reviews.freebsd.org/D7422
303823
hyperv/ic: Expose the receive buffer length for callers to use.
Sponsored by: Microsoft
Differential Revision: https://reviews.freebsd.org/D7423
303824
hyperv/ic: Pass the channel callback to hv_util_attach()
The saved channel callback in util softc is actually never used.
Sponsored by: Microsoft
Differential Revision: https://reviews.freebsd.org/D7424
Diffstat (limited to 'sys/dev/hyperv/utilities/hv_shutdown.c')
| -rw-r--r-- | sys/dev/hyperv/utilities/hv_shutdown.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sys/dev/hyperv/utilities/hv_shutdown.c b/sys/dev/hyperv/utilities/hv_shutdown.c index 352df91..e0eb25c 100644 --- a/sys/dev/hyperv/utilities/hv_shutdown.c +++ b/sys/dev/hyperv/utilities/hv_shutdown.c @@ -68,7 +68,7 @@ hv_shutdown_cb(struct vmbus_channel *channel, void *context) softc = (hv_util_sc*)context; buf = softc->receive_buffer;; - recv_len = PAGE_SIZE; + recv_len = softc->ic_buflen; ret = vmbus_chan_recv(channel, buf, &recv_len, &request_id); KASSERT(ret != ENOBUFS, ("hvshutdown recvbuf is not large enough")); /* XXX check recv_len to make sure that it contains enough data */ @@ -79,8 +79,7 @@ hv_shutdown_cb(struct vmbus_channel *channel, void *context) &buf[sizeof(struct hv_vmbus_pipe_hdr)]; if (icmsghdrp->icmsgtype == HV_ICMSGTYPE_NEGOTIATE) { - hv_negotiate_version(icmsghdrp, NULL, buf); - + hv_negotiate_version(icmsghdrp, buf); } else { shutdown_msg = (struct hv_vmbus_shutdown_msg_data *) @@ -132,11 +131,7 @@ hv_shutdown_probe(device_t dev) static int hv_shutdown_attach(device_t dev) { - hv_util_sc *softc = (hv_util_sc*)device_get_softc(dev); - - softc->callback = hv_shutdown_cb; - - return hv_util_attach(dev); + return hv_util_attach(dev, hv_shutdown_cb); } static device_method_t shutdown_methods[] = { |
