Date: Wed, 20 May 2020 13:51:27 +0000 (UTC) From: Li-Wen Hsu <lwhsu@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361278 - in head/sys/dev/hyperv: hvsock vmbus Message-ID: <202005201351.04KDpRPh013247@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lwhsu Date: Wed May 20 13:51:27 2020 New Revision: 361278 URL: https://svnweb.freebsd.org/changeset/base/361278 Log: Fix i386 build for r361275 kponsored by: The FreeBSD Foundation Modified: head/sys/dev/hyperv/hvsock/hv_sock.c head/sys/dev/hyperv/vmbus/vmbus_br.c Modified: head/sys/dev/hyperv/hvsock/hv_sock.c ============================================================================== --- head/sys/dev/hyperv/hvsock/hv_sock.c Wed May 20 11:20:45 2020 (r361277) +++ head/sys/dev/hyperv/hvsock/hv_sock.c Wed May 20 13:51:27 2020 (r361278) @@ -792,7 +792,7 @@ hvs_trans_sosend(struct socket *so, struct sockaddr *a int error = 0; HVSOCK_DBG(HVSOCK_DBG_VERBOSE, - "%s: HyperV Socket hvs_trans_sosend called, uio_resid = %lu\n", + "%s: HyperV Socket hvs_trans_sosend called, uio_resid = %zd\n", __func__, uio->uio_resid); if (so->so_type != SOCK_STREAM) @@ -1154,7 +1154,7 @@ hvsock_br_callback(void *datap, int cplen, void *cbarg return (EINVAL); HVSOCK_DBG(HVSOCK_DBG_VERBOSE, - "%s: called, uio_rw = %s, uio_resid = %lu, cplen = %u, " + "%s: called, uio_rw = %s, uio_resid = %zd, cplen = %u, " "datap = %p\n", __func__, (uio->uio_rw == UIO_READ) ? "read from br":"write to br", uio->uio_resid, cplen, datap); @@ -1168,7 +1168,7 @@ hvsock_br_callback(void *datap, int cplen, void *cbarg SOCKBUF_LOCK(sb); HVSOCK_DBG(HVSOCK_DBG_VERBOSE, - "%s: after uiomove, uio_resid = %lu, error = %d\n", + "%s: after uiomove, uio_resid = %zd, error = %d\n", __func__, uio->uio_resid, error); return (error); @@ -1372,8 +1372,9 @@ hvsock_canwrite_check(struct hvs_pcb *pcb) * We must always reserve a 0-length-payload packet for the FIN. */ HVSOCK_DBG(HVSOCK_DBG_VERBOSE, - "%s: writeable is %u, should be greater than %lu\n", - __func__, writeable, HVSOCK_PKT_LEN(1) + HVSOCK_PKT_LEN(0)); + "%s: writeable is %u, should be greater than %ju\n", + __func__, writeable, + (uintmax_t)(HVSOCK_PKT_LEN(1) + HVSOCK_PKT_LEN(0))); if (writeable < HVSOCK_PKT_LEN(1) + HVSOCK_PKT_LEN(0)) { /* Modified: head/sys/dev/hyperv/vmbus/vmbus_br.c ============================================================================== --- head/sys/dev/hyperv/vmbus/vmbus_br.c Wed May 20 11:20:45 2020 (r361277) +++ head/sys/dev/hyperv/vmbus/vmbus_br.c Wed May 20 13:51:27 2020 (r361278) @@ -66,9 +66,10 @@ vmbus_br_sysctl_state(SYSCTL_HANDLER_ARGS) ravail = br->vbr_dsize - wavail; snprintf(state, sizeof(state), - "intrcnt:%lu rindex:%u windex:%u imask:%u psndsz:%u fvalue:%u " + "intrcnt:%ju rindex:%u windex:%u imask:%u psndsz:%u fvalue:%u " "ravail:%u wavail:%u", - intrcnt, rindex, windex, imask, psndsz, fvalue, ravail, wavail); + (uintmax_t)intrcnt, rindex, windex, imask, psndsz, fvalue, + ravail, wavail); return sysctl_handle_string(oidp, state, sizeof(state), req); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005201351.04KDpRPh013247>