From nobody Mon Jan 31 18:47:48 2022 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 164C71999981; Mon, 31 Jan 2022 18:47: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JncWS718gz3JWp; Mon, 31 Jan 2022 18:47:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643654869; 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=NI8tqTy/YYTwVw9MwFqsif0DD73b00nQzHfiGFkmq9Y=; b=gYYwJmUTYqjYlXuVwechb1mghY1YgWPbmhCdqAyLbfMJp51sVQ0FC24AKd0B6eyy2KcTpg U1U+dhxNglD7q+l2/8M4KtElbpQVqhdxjtEiGz32JeLoCS1/4h6OfCF9lB62qcvzyVZXZ9 XbQaKKRZnM6r+i8+8vC9169hBf9IQV+Hg/69PJDO3piUo2ovsZbHRr+HXyiJNeIudaI5aE gKpselpW075/Ije4TtQXFIZG/sww1OWR1cYtVJio+QgyU4y2KUfnd1r++MR/QCWl5m1Jdp 6kHm6PqBjDjbrBEgvp3ZyDAcEatC3oNndPYlwcGbNM0v2mAr6+248evFCa3N4Q== 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 C6EAF21616; Mon, 31 Jan 2022 18:47:48 +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 20VIlmAr089877; Mon, 31 Jan 2022 18:47:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20VIlmno089876; Mon, 31 Jan 2022 18:47:48 GMT (envelope-from git) Date: Mon, 31 Jan 2022 18:47:48 GMT Message-Id: <202201311847.20VIlmno089876@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: b4cc5d63b611 - main - bhyve/virtio: use correct device id for virtio-scsi 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: b4cc5d63b6112746598d21413c9800a43171da52 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643654869; 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=NI8tqTy/YYTwVw9MwFqsif0DD73b00nQzHfiGFkmq9Y=; b=APjstG4fSiv0iAfxBs66E5xcmA3M/Haz9rYsEYVi/HZw9DomZAx46BAUKw5LSFQNIGurwN h7VvGw6Q2HYXZQiuhrBT2UPkRfYAiqIjgtdpZNLOnuU03BZMhM7CVx3by3FGwbGMokYKKm QzB1tsS7iT/mbLK/DJKfundUoduG0APD9NHkdzcSrgLMkS4HxMLq80lqLKBjZkWWQ44GAT 3v3Rx/j8yelKz4O+7vuVfOoz0qkIXUZxOYh+e8GXI/w57RI42AxaO05n/IYj6/cgFBTQJs xQDTCCc0+FmBXbbhTlMtxulI27kdZr+SOgq2N6/aLpA1EyxiJjE1m2Q5GxQXww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643654869; a=rsa-sha256; cv=none; b=l/ZVeuzGPB4MB8OAYiEP182U8PGA4Iygo67gqPUvZNcXQeP6mlNkrA7f4rWpFFEBCgHvOj NbUXSPxt6Gp1OeyLuZQhAS2l5sFE7jSh0kth1/ID05lCLRb5tfeKl3PFSX4hWlSXwZWArE +DwQlkHMXQTH+u9+YnfMX+muecdKv4yLZob3D6s7phRtUzz47/TADkcL6vPSt1psRO176J yme7JwtL4iBQO9Mk5nveQi8l3UNMy5jwqBkrZZfKYF+v9yNBhRzSdpMCIJd4Dgaq0DiXnS b0ImgVCx63VzeVQEiH8LcLAyeuRGhq57iFOIf9uN7YhpkC/ctBBI9UZ4jhd8ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=b4cc5d63b6112746598d21413c9800a43171da52 commit b4cc5d63b6112746598d21413c9800a43171da52 Author: Robert Wing AuthorDate: 2022-01-31 18:44:47 +0000 Commit: Robert Wing CommitDate: 2022-01-31 18:44:47 +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 --- 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 5731baa0dd0d..5300fb5dbef3 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 #define VIRTIO_DEV_INPUT 0x1052