From nobody Thu Feb 5 18:49:48 2026 X-Original-To: dev-commits-src-main@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 4f6R993bMbz6R2j8 for ; Thu, 05 Feb 2026 18:49:49 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6R986kmrz4Dvg for ; Thu, 05 Feb 2026 18:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770317389; 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=PWAn5bV2eh7YA4J02hTf6UcPRv8cguIScdakcrO0d/8=; b=GiX3tgsqIyklWAQHKsX8KIcVTjs5uCPN/wNagt80Sn1KzxMhKOKiub/kg+t83m4ou1843k lD6jqL9+twK416JbEggYS7krnGn6NbpB9qT2lsYsSbQsfey4kJx0ySTBkaq5xVMcSSnXdt YMUK1m91C4G1qoAA5dIFzQhQb5E04q58NGVH+oPUU0KqrdIbO/coWkZrcoE2bn0DH8L9h/ lwvumXVvZZe7oQmqDmfOJ6MNgxm+tNbfiSxlXbs/xwzZ9XnP84gP2/l5pGFZOPfQRozbER dzDI6NycGKXxwIH0XBX+8VCKapkEVhrp6CG1X2vmVd4Yp8Ykygq5+h6W6eMe+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770317389; a=rsa-sha256; cv=none; b=wH4x9ItSMugneg86dyxICgrMhZJYgDhS+voeOMm5ZRmnD0r/7w3lg0kmPZkUlE5MRKIJhd 7RXjrq0tdO4K/ONhitoL2EpzS116xfPERNb5bHzWSEluMifu4sxx4yWqp3dadd49vDFilh e8KnpuiSyf4VFdV1/KDdRR5abUMFkCM8trADZw4G/iGDTMmxBrFkjn/A1pHcryadJdmmtb MkbiEnXTg7wowHOUtl7kh4XkrICnfVw7wD84KmenU6FFE0pr8hKOjoTqdYQLBvz4dX5xv2 w+CcR7YHcGvINrGy5nUTwG8NERsQpi7mDYNUNYOpvGhFNdrwXXE8ss1FM0VqcA== 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=1770317388; 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=PWAn5bV2eh7YA4J02hTf6UcPRv8cguIScdakcrO0d/8=; b=rjmcZkWHo3uLH8mjcMVLt73JYiUTuAVyfNz7i+DvLa4ZvAvUCybwAIZqKz2gClaeMsopZW XWuK5IxVuer3f87SDabqx0hQgyqqGkR3YpkZ+VZ93xyHReilIzv2Kbv7OWbGgWMb6YvX9D YOBz3wzOWLSBhCaA+8T0SzsGnIu4An8Vhvsh0h5CXPJhEHTlbE4xCtHPWgKUQXrBtLdT5a xakJ6KRijgIDe/2622M5e8Oq+8NvPT1zrBA+9/v0Gt83cqkoseYKr5OGlqhTIs/v41J8Hb pQJ+rm6MDtiU31HA8nk+vLwW9gnHx1V7ZHDqOBWNFp28MAfU2TL9ZIZ6BfZbqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6R985hjPzj12 for ; Thu, 05 Feb 2026 18:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 337f5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 18:49:48 +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: 5379c4627782 - main - bhyve/virtio: check negotiated_caps for indirect descriptor support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org 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: 5379c4627782ebb2619f95a5784361c88472c8b5 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 18:49:48 +0000 Message-Id: <6984e64c.337f5.24cfed28@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5379c4627782ebb2619f95a5784361c88472c8b5 commit 5379c4627782ebb2619f95a5784361c88472c8b5 Author: Hans Rosenfeld AuthorDate: 2026-02-05 18:48:10 +0000 Commit: Ed Maste CommitDate: 2026-02-05 18:49:09 +0000 bhyve/virtio: check negotiated_caps for indirect descriptor support vq_getchain() erroneously checked vc_hv_caps for indirect descriptor support when it encountered an indirect descriptor. vc_hv_caps is used in feature negotiation to advertise what features our device emulation supports, but we should really check what features we have negotiated with the driver. Reviewed by: corvink Differential Revision: https://reviews.freebsd.org/D53465 --- usr.sbin/bhyve/virtio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/virtio.c b/usr.sbin/bhyve/virtio.c index 304156bf7416..a5ccbb9983a0 100644 --- a/usr.sbin/bhyve/virtio.c +++ b/usr.sbin/bhyve/virtio.c @@ -331,7 +331,7 @@ vq_getchain(struct vqueue_info *vq, struct iovec *iov, int niov, if ((vdir->flags & VRING_DESC_F_INDIRECT) == 0) { _vq_record(i, vdir, ctx, iov, niov, &req); i++; - } else if ((vs->vs_vc->vc_hv_caps & + } else if ((vs->vs_negotiated_caps & VIRTIO_RING_F_INDIRECT_DESC) == 0) { EPRINTLN( "%s: descriptor has forbidden INDIRECT flag, "