git: cd6bdac0818a - stable/13 - bhyve/virtio: use correct device id for virtio-scsi

From: Robert Wing <>
Date: Thu, 10 Feb 2022 19:46:11 UTC
The branch stable/13 has been updated by rew:


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 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:
    Reviewed by:    imp, jhb
    Fixes:  f9c005a17f4e ("Add bhyve virtio-scsi storage backend support.")
    Differential Revision:
    (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 */