From nobody Thu Feb 10 19:46:11 2022 X-Original-To: dev-commits-src-branches@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 CE8C319AADE5; Thu, 10 Feb 2022 19:46:12 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JvnLD21pZz3JdJ; Thu, 10 Feb 2022 19:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644522372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eLG1bwSuy52DpOmaJArki+U//zxYkcz2yY5SsvmsN4A=; b=cWlcMzNS48cV4eFNII8IfE4aNztcAJhCMb5TMDbh0AGTWSow3XfoK4JK5L7MAPX6usVaJa q9fd2k9zDULqZXF4fim7Y3zJ3TZ3spkwNieLaLkZxptjcVrRTVu2521cqkOCYRDrmIab7e 5BQjGpTRCmyxc8bNu9C4neapYWuuF833tj6sero/CtXyvvoVjzN7ur1gediQfCZIJJ67d8 L8DqwWyQ7ZojybKPRcHLFi7n38olipTv9Z87/82wglJgT147HnYv21elLI+7w7yfjMqVir +gna65+QXhAN3VNeRaCZ/kbLJghul+hzVmAZhC+exeyNKqlq/BhtEQiFNZfuEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CCE8C26728; Thu, 10 Feb 2022 19:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21AJkBbj035880; Thu, 10 Feb 2022 19:46:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21AJkBgt035879; Thu, 10 Feb 2022 19:46:11 GMT (envelope-from git) Date: Thu, 10 Feb 2022 19:46:11 GMT Message-Id: <202202101946.21AJkBgt035879@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Wing Subject: git: cd6bdac0818a - stable/13 - bhyve/virtio: use correct device id for virtio-scsi List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cd6bdac0818a44f4faceddc485e314855c0b3f11 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644522372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eLG1bwSuy52DpOmaJArki+U//zxYkcz2yY5SsvmsN4A=; b=GH4h8u5jMsH5sBdCWPXRfIbnn3A+tGw6juV8g2rSx4BdRG0p/j3NsS6zuVlQez0atn7hGF stNOPQXb3gfEsQ4iKMKBlSBnu4EiIogQ4BDehTi2RMZxzDPApYrcmFMavg0rmyFbf/N8fs CpR2uR1sUyN5muYUd8+VqAXU2CPuphKGjqzU7kjDu+yBR9wnPGCwcUhBtH1lW/inLnWNR/ e/qFnXWa533ksIf0bS5rcgUJTHeKbo3DhQOsZsTMbjZ5WQNf2Ke4jwAFVdbgDk48dixYto KNKk1f4VTVWrg5FfpbCJztRsZ0eSRw23d8VJ+bkbeEvGrWtOPgJTxSvC7glncw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644522372; a=rsa-sha256; cv=none; b=sOQrX9MoF1zwyn3hfqIu1oAuD0hsiuO0H66exQ0dnG4yyZtbUDRNkqqt89j2/hifeFyPbo zRbY31zDz/VggGWH8ONlMnuSHQtWG2jUvCUtjGrMpKxPXeirLRsNuNxYZExr1jOMSU3iEI ojMNGJVmdFf0Z2uSeKE5rnAcaeFEs7uouANTDNfykavR5nfNZfeMGu/P5jXQWkLpueuLf3 w+HeYcNn25C1RDCA8RpbvRpzWDh5zTmP+B7tb1as5VmHiyvkUUwBI14XftGrFoMORChi1j VK5UwRhXmQzxCF/UmrzbUYG4coN00NT/9vDiE0v8xq8sT0k2chQEe0THiKhcow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=cd6bdac0818a44f4faceddc485e314855c0b3f11 commit cd6bdac0818a44f4faceddc485e314855c0b3f11 Author: Robert Wing AuthorDate: 2022-01-31 18:44:47 +0000 Commit: Robert Wing CommitDate: 2022-02-10 19:45:56 +0000 bhyve/virtio: use correct device id for virtio-scsi Section 4.1.2.1 of the virtio spec states that the transitional PCI device id for a scsi device is 0x1004. Fix suggested by reporter. PR: 259961 Reported by: me@nanaya.pro Reviewed by: imp, jhb Fixes: f9c005a17f4e ("Add bhyve virtio-scsi storage backend support.") Differential Revision: https://reviews.freebsd.org/D34103 (cherry picked from commit b4cc5d63b6112746598d21413c9800a43171da52) --- usr.sbin/bhyve/virtio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/virtio.h b/usr.sbin/bhyve/virtio.h index 5b2cf6fe2cc8..a14765e49764 100644 --- a/usr.sbin/bhyve/virtio.h +++ b/usr.sbin/bhyve/virtio.h @@ -168,8 +168,8 @@ #define VIRTIO_DEV_NET 0x1000 #define VIRTIO_DEV_BLOCK 0x1001 #define VIRTIO_DEV_CONSOLE 0x1003 +#define VIRTIO_DEV_SCSI 0x1004 #define VIRTIO_DEV_RANDOM 0x1005 -#define VIRTIO_DEV_SCSI 0x1008 #define VIRTIO_DEV_9P 0x1009 /* From section 2.3, "Virtqueue Configuration", of the virtio specification */