From nobody Wed May 06 17:38:36 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9jKf33L1z6cFcB for ; Wed, 06 May 2026 17:38:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9jKY2V3tz3nGt for ; Wed, 06 May 2026 17:38:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778089121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vxf7V4NblRQ7CyEO0HtwZNymufl0yC5m+MCVzng54V4=; b=yX/Ho4iI/7qe+zQrgAkvQ7xRqZJ18GBccmcyEioXALQtpgGQcmXb/TQhGbNTRVvj1ZMWAw 3cjZkkqfcyZ3VGWaZuqY0UAXTp+iWmmeOIQUG9ZOuCvbCrU5d0OFp+VhfJ8t2x/WzruoY2 /GzXmIxY/Nz6A+BdOe1DUYPyrZMynOLI8uUysp+FAEAgwvQ0n0VbQjP28leCGOqipdsuey tvcIYuPhDb/2ofq8fx0C0T0qqDHtxbDBRT7TSILeRBrtqAC4HG30aqGB4UD5JgiEDBRnPy 9DD2OQfS0ladO5DEM7rSU3vV9r1CCwVK/hmfj4PHFEUjptu7ox+0lcC2iWaQnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778089121; a=rsa-sha256; cv=none; b=UwY7Dxo7qVOx2wJkqXT+WBH6IjYzSv+mTixYCR9GhyUjbzYxtbstUxiy8pcxS0cNjPAapa AurgI+lzwANpQpNVpgIiMpdXhb60AZRIoZgT4IxwQJiWCddvHAaZTjlxzCFGPdnyGoerlZ HS5d/bIMDAQ7pOIPb2zrcHcVakn5y8h5Z0xD8cjbKOy9tHfReFXRM5DpzviCk5qq2LvY/o cGqUzAb5X6XEzkSdmBvaNDN1GeYKnawKdWWsP5r4AxoIx08609U/BKPFvkKxj6jG7nJl9k qDz2DUMQ+A0o3hHmXaocSpXGw33B3dVXBVMuh2Rn2FCbLWxK9yHJ9gNxGLNiFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778089121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vxf7V4NblRQ7CyEO0HtwZNymufl0yC5m+MCVzng54V4=; b=krLwXZzXXcsIUCS83IhDMsBFQ7HBSDLymmh04yJ6Fu3QURlJfdbyUamC8PIxbv784Y/9fk JW8koLTE3RBbNxV+9pxh30NlrT4mc1hZKV+2U0IKNjXTH5dxo7rKMPJ0xB+flZUOAx14KJ IiUJph9y5T/MFxTiU45etvN/88V/rkX/m6GrCKqpSDfPlF8NwP0ZUoqB8P1FNPNpZQ/K8Y 7kTM0wHigIOtSgnfhQD0rqbMZ2ZIbodDvrhX36XlA1g6Wn/56qw98AfXSz0cM/6qSQ/nE0 TlulBFJ/VOTc60FVOZrIHTp5Z7tu95YnEj8BdjsiHM+2nfmyakeBbdKUyDBZ6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9jKY1n7qzpjV for ; Wed, 06 May 2026 17:38:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33737 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 17:38:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Hans Rosenfeld From: Ed Maste Subject: git: bc9f667eb11d - main - bhyve/virtio-scsi: Don't invoke iov_to_buf() in an assert() expression List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc9f667eb11d9b47541f834faefbc6aac077cee2 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 17:38:36 +0000 Message-Id: <69fb7c9c.33737.73b4140e@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bc9f667eb11d9b47541f834faefbc6aac077cee2 commit bc9f667eb11d9b47541f834faefbc6aac077cee2 Author: Hans Rosenfeld AuthorDate: 2026-03-10 19:14:10 +0000 Commit: Ed Maste CommitDate: 2026-05-06 17:36:48 +0000 bhyve/virtio-scsi: Don't invoke iov_to_buf() in an assert() expression If anyone would build bhyve with -DNDEBUG, any code in the expression in assert() won't be executed. Instead put the return value in a temporary variable to assert that it has the expected value. Reviewed by: emaste, markj (earlier version) Fixes: 2a514d377b37 ("bhyve/virtio-scsi: Preallocate all I/O requests") Differential Revision: https://reviews.freebsd.org/D55803 --- usr.sbin/bhyve/pci_virtio_scsi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/pci_virtio_scsi.c b/usr.sbin/bhyve/pci_virtio_scsi.c index dafff50fa531..5fb867e5eae7 100644 --- a/usr.sbin/bhyve/pci_virtio_scsi.c +++ b/usr.sbin/bhyve/pci_virtio_scsi.c @@ -669,6 +669,7 @@ pci_vtscsi_queue_request(struct pci_vtscsi_softc *sc, struct vqueue_info *vq) struct pci_vtscsi_queue *q = &sc->vss_queues[vq->vq_num - 2]; struct pci_vtscsi_request *req; struct vi_req vireq; + size_t res __maybe_unused; int n; pthread_mutex_lock(&q->vsq_fmtx); @@ -747,8 +748,9 @@ pci_vtscsi_queue_request(struct pci_vtscsi_softc *sc, struct vqueue_info *vq) * This will have to change if we begin allowing config space writes * to change sense size. */ - assert(iov_to_buf(req->vsr_iov_in, req->vsr_niov_in, - (void **)&req->vsr_cmd_rd) == VTSCSI_IN_HEADER_LEN(q->vsq_sc)); + res = iov_to_buf(req->vsr_iov_in, req->vsr_niov_in, + (void **)&req->vsr_cmd_rd); + assert(res == VTSCSI_IN_HEADER_LEN(q->vsq_sc)); /* Make sure this request addresses a valid LUN. */ if (pci_vtscsi_check_lun(req->vsr_cmd_rd->lun) == false) {