Module Name: src
Committed By: riastradh
Date: Sun Apr 16 18:37:16 UTC 2023
Modified Files:
src/sys/dev/virtio: viocon.c
Log Message:
viocon(4): Show error in assertion failure.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/virtio/viocon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/virtio/viocon.c
diff -u src/sys/dev/virtio/viocon.c:1.8 src/sys/dev/virtio/viocon.c:1.9
--- src/sys/dev/virtio/viocon.c:1.8 Thu Mar 23 03:55:11 2023
+++ src/sys/dev/virtio/viocon.c Sun Apr 16 18:37:16 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: viocon.c,v 1.8 2023/03/23 03:55:11 yamaguchi Exp $ */
+/* $NetBSD: viocon.c,v 1.9 2023/04/16 18:37:16 riastradh Exp $ */
/* $OpenBSD: viocon.c,v 1.8 2021/11/05 11:38:29 mpi Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: viocon.c,v 1.8 2023/03/23 03:55:11 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viocon.c,v 1.9 2023/04/16 18:37:16 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -377,7 +377,7 @@ viocon_rx_fill(struct viocon_port *vp)
virtio_enqueue_commit(vsc, vq, slot, 0);
ndone++;
}
- KASSERT(r == 0 || r == EAGAIN);
+ KASSERTMSG(r == 0 || r == EAGAIN, "r=%d", r);
if (ndone > 0)
virtio_notify(vsc, vq);
}
@@ -453,9 +453,9 @@ vioconstart(struct tty *tp)
SET(tp->t_state, TS_BUSY);
break;
}
- KASSERT(ret == 0);
+ KASSERTMSG(ret == 0, "ret=%d", ret);
ret = virtio_enqueue_reserve(vsc, vq, slot, 1);
- KASSERT(ret == 0);
+ KASSERTMSG(ret == 0, "ret=%d", ret);
buf = vp->vp_tx_buf + slot * BUFSIZE;
cnt = q_to_b(&tp->t_outq, buf, BUFSIZE);
bus_dmamap_sync(virtio_dmat(vsc), vp->vp_dmamap,
