Module Name: src Committed By: isaki Date: Sat Feb 10 02:25:15 UTC 2024
Modified Files: src/sys/dev/pci: virtio.c Log Message: Split KASSERT(A && B) into KASSERT(A); KASSERT(B). To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/sys/dev/pci/virtio.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/pci/virtio.c diff -u src/sys/dev/pci/virtio.c:1.80 src/sys/dev/pci/virtio.c:1.81 --- src/sys/dev/pci/virtio.c:1.80 Fri Feb 9 22:08:36 2024 +++ src/sys/dev/pci/virtio.c Sat Feb 10 02:25:15 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: virtio.c,v 1.80 2024/02/09 22:08:36 andvar Exp $ */ +/* $NetBSD: virtio.c,v 1.81 2024/02/10 02:25:15 isaki Exp $ */ /* * Copyright (c) 2020 The NetBSD Foundation, Inc. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.80 2024/02/09 22:08:36 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.81 2024/02/10 02:25:15 isaki Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1069,7 +1069,8 @@ virtio_enqueue_reserve(struct virtio_sof struct vring_desc_extra *vdx; int i; - KASSERT(1 <= nsegs && nsegs <= vq->vq_num); + KASSERT(1 <= nsegs); + KASSERT(nsegs <= vq->vq_num); vdx = &vq->vq_descx[slot]; vd = &vq->vq_desc[slot];