From nobody Fri Jan 9 08:47:36 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1767450056; cv=none; d=zohomail.com; s=zohoarc; b=IENBP0hx1vSzVvLGr8+0WXOkE8HaYrtWYnp5fgshy4f0FG6lCdhKaKgA8KsUDP7adBQeh/mz8Uo0HG6iRWZ6iVYd8MmrlRuNHsrRD6c248o+I1Pg2sZlItTl/IdRxPBSmXCrIxNl3vi8dTVDO2UfKBZFLXyRY86FWSor/3MpCY4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767450056; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=6eTzEp9cll727QF0zwcXRnUD0zelm8IorWNDPN+b9p4=; b=Y35qZEQINewKJFJj9LAOmxNSoNQtNRd/dgr0xXPBBt/txUDbJjobiJCvyGfqiqQEfEnmG8y1FZzqnNsTkg2n5AOvV1G/XwXt2AsSeuzH7KDemcxbxUHQam8KM+ofFcvbvpUOUCStvwRsxeHjzJJivaHZABKrDyL5ZsHOWLj6Qx0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 176745005631475.16151122547967; Sat, 3 Jan 2026 06:20:56 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 605B03F8B0; Sat, 3 Jan 2026 09:20:55 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 8D6FC41A12; Sat, 3 Jan 2026 09:17:50 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 00030417F0; Sat, 3 Jan 2026 09:14:33 -0500 (EST) Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 8A6FC3F8B4 for ; Sat, 3 Jan 2026 09:14:32 -0500 (EST) Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-b7277324054so2093092466b.0 for ; Sat, 03 Jan 2026 06:14:32 -0800 (PST) Received: from tulp.my.domain (2001-1c02-1a15-3000-c218-03ff-feb5-6cc4.cable.dynamic.v6.ziggo.nl. [2001:1c02:1a15:3000:c218:3ff:feb5:6cc4]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8037ab86cesm4961769166b.19.2026.01.03.06.14.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Jan 2026 06:14:29 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767449671; x=1768054471; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6eTzEp9cll727QF0zwcXRnUD0zelm8IorWNDPN+b9p4=; b=BJVeOEKabBWlDnQMhqU08TsBAxNvtwBuBVUPdExRAF0GSDFyDZnE3DGuUnLRYAZxkd GAksRAM8Y9BqJgDQ2K6TIfcNabnCvI8BHFcvNi3AtaFhI3/8LHaczytesD7lkqLwRXBi 1IuHMg7stNgdrD7o46KBmfTLI6BkF1G11B6drFhsL6hsOginV/EE8B0wmARLUHEDJ8OS 18qcn5vqAnk6Iqkkcr7FRBoP7rUegLT+8gfBJo8P7eAiZjvdKKz6uNM/oTpmZk9O5NIp FC/q3ETH4od59FJtY4p6K0ymqdKSNzPoZdMWB/fNB5e2yfyhTVIpyISekv3CjshOpwas iWfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767449671; x=1768054471; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=6eTzEp9cll727QF0zwcXRnUD0zelm8IorWNDPN+b9p4=; b=cQ8vZRlGcugDIXMq43I7qGIAY1jCJ9d5z3RYBn7EY+48G5pzoz+rFNlPwvJHSJXac7 XXNQBvcUxyjjLjEsiRn9cXxltj5ipAUHxsc7j/0bESdR0IeWKQaBELJ864NXjJZQjonm OZ/GTGzefCKVX0+a5q+rlPV0N+OX6SU2g2T/oXxlQ1U+XZxAdCnop4qVPbdQqFl6Kg7/ GmifdlrUDS9dc2xITvGOiy4BskHdA3YWhTi7so+08/2Y1vbWWFsx2g9czv3dMXfWGFJb vC5SuDVwpPxWL64++wiGfnkxEcy2n5lCHRziGkhsbjPkPGKnh31BeqKRE6kXH2iBB2O3 /kLw== X-Gm-Message-State: AOJu0YwLYwZw8+ljNydcwrTfZP/ZYLwoyBSLmYCRG+pIdTHgJm/w+fPw o6NR4PkofPd1BrSOuI3OnXWtFl9UhdhNQicVbx4N4+Hc0nfoKvkvzKo9USv3MpEk X-Gm-Gg: AY/fxX5AcDLiQcA6q0o5BsOHc/P3QXcD8fV+K0cK0ZfiQT2ntu+MS7nDpMF2yS2QT9M 3cHJ1J9hEmgOPt9LKqLy1awbHQcRlaMKVvoQb/aCEkoZNJe2cWlQIXpS6hWxYN0ZC4s3NSKRF+c Jv3ViVBcgEMSfBN6Fpmaz1H2Jqowo6MelTRyOOmtt6Bs71Qfy6aMhKMdWzNCHK6q3Mag0rDXNWs v5XLmWNXK0KgH6o1YmTPe3PlxX+TRA14HkZWH6pqnzuzditLCPVsZTW8/MsnRh90kfjAPwrnhf3 6HEJ2OozN/EwRX5KbsqLeAjMDbNih37CFY3fG/B5HArzdvEuZKfk9sZYSumyBx/TjZUcwMO6OpN +YyyR9AB3Cnuu4JrZWoRo3GwA7Wm13FULirunPZR2Ey0uq3uv3P+7FBu4WRNRF+pP7Hqs3HDAGv +t1H8bisegWeDlERtuj9XO7/RKMAea3K8hdbnYiBL1hYKaScKI6RqCi+8oET/xHteKsu4rRqy2G laRm3mEaZ5NKN6728C1gmx+ X-Google-Smtp-Source: AGHT+IElMpxJ5fpWoTEPkMdlv9RQ66FRSq3Nos83QdyaeaxbKgfxgCgLzMyz5igKHiNJicGIU+HBeg== X-Received: by 2002:a17:907:2d0e:b0:b76:bcf5:a38a with SMTP id a640c23a62f3a-b8036a924ffmr4958526466b.0.1767449670390; Sat, 03 Jan 2026 06:14:30 -0800 (PST) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH 2/3] bhyve: add virtio-scsi support Date: Sat, 3 Jan 2026 15:11:41 +0100 Message-ID: <20260103141142.53817-3-bogorodskiy@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260103141142.53817-1-bogorodskiy@gmail.com> References: <20260103141142.53817-1-bogorodskiy@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ZYV44JZH7GYPR6W6SWPERPGYOTFTDU6U X-Message-ID-Hash: ZYV44JZH7GYPR6W6SWPERPGYOTFTDU6U X-MailFrom: bogorodskiy@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Roman Bogorodskiy X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1767450058817154100 Content-Type: text/plain; charset="utf-8" Bhyve supports virtio-scsi devices using the following syntax: bhyve ... -s N,virtio-scsi,/dev/cam/ctl[pp.vp][,scsi-device-options] Where /dev/cam/ctl is a ctl(4) device path. The optional "scsi-device-options" include "iid" (Initiator ID) and "bootindex", which are currently not used by libvirt. Model this device using: Signed-off-by: Roman Bogorodskiy --- src/bhyve/bhyve_command.c | 73 ++++++++++++++++++- src/bhyve/bhyve_device.c | 1 + .../bhyvexml2argv-virtio-scsi.args | 10 +++ .../bhyvexml2argv-virtio-scsi.ldargs | 4 + .../bhyvexml2argv-virtio-scsi.xml | 21 ++++++ tests/bhyvexml2argvtest.c | 1 + .../bhyvexml2xmlout-virtio-scsi.xml | 32 ++++++++ tests/bhyvexml2xmltest.c | 1 + 8 files changed, 139 insertions(+), 4 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-virtio-scsi.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-virtio-scsi.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-virtio-scsi.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-virtio-scsi.x= ml diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index bc37f4cef9..989af05f05 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -327,6 +327,63 @@ bhyveBuildAHCIControllerArgStr(const virDomainDef *def, return 0; } =20 +static int +bhyveBuildSCSIControllerArgStr(const virDomainDef *def, + virDomainControllerDef *controller, + struct _bhyveConn *driver G_GNUC_UNUSED, + virCommand *cmd) +{ + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + const char *disk_source; + size_t i; + + for (i =3D 0; i < def->ndisks; i++) { + g_auto(virBuffer) device =3D VIR_BUFFER_INITIALIZER; + virDomainDiskDef *disk =3D def->disks[i]; + + if (disk->bus !=3D VIR_DOMAIN_DISK_BUS_SCSI) + continue; + + if (disk->info.addr.drive.controller !=3D controller->idx) + continue; + + VIR_DEBUG("disk %zu controller %d", i, controller->idx); + + if (virDomainDiskGetType(disk) !=3D VIR_STORAGE_TYPE_CTL) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("unsupported disk type")); + return -1; + } + + if (virDomainDiskTranslateSourcePool(disk) < 0) + return -1; + + disk_source =3D virDomainDiskGetSource(disk); + + if ((disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_CDROM) && + (disk_source =3D=3D NULL)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("cdrom device without source path not support= ed")); + return -1; + } + + if (disk->device !=3D VIR_DOMAIN_DISK_DEVICE_DISK) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("unsupported disk device")); + return -1; + } + + virCommandAddArg(cmd, "-s"); + virCommandAddArgFormat(cmd, "%d:0,virtio-scsi,%s", + controller->info.addr.pci.slot, + virDomainDiskGetSource(disk)); + + return 0; + } + + return 0; +} + static int bhyveBuildUSBControllerArgStr(const virDomainDef *def, virDomainControllerDef *controller, @@ -458,6 +515,9 @@ bhyveBuildDiskArgStr(const virDomainDef *def, case VIR_DOMAIN_DISK_BUS_SATA: /* Handled by bhyveBuildAHCIControllerArgStr() */ break; + case VIR_DOMAIN_DISK_BUS_SCSI: + /* Handled by bhyveBuildSCSIControllerArgStr() */ + break; case VIR_DOMAIN_DISK_BUS_NVME: /* Handled by bhyveBuildNVMeControllerArgStr() */ break; @@ -465,7 +525,6 @@ bhyveBuildDiskArgStr(const virDomainDef *def, if (bhyveBuildVirtIODiskArgStr(def, disk, cmd) < 0) return -1; break; - case VIR_DOMAIN_DISK_BUS_SCSI: case VIR_DOMAIN_DISK_BUS_IDE: case VIR_DOMAIN_DISK_BUS_FDC: case VIR_DOMAIN_DISK_BUS_NONE: @@ -502,6 +561,10 @@ bhyveBuildControllerArgStr(const virDomainDef *def, if (bhyveBuildAHCIControllerArgStr(def, controller, driver, cmd) <= 0) return -1; break; + case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: + if (bhyveBuildSCSIControllerArgStr(def, controller, driver, cmd) <= 0) + return -1; + break; case VIR_DOMAIN_CONTROLLER_TYPE_USB: if (++*nusbcontrollers > 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -528,7 +591,6 @@ bhyveBuildControllerArgStr(const virDomainDef *def, break; case VIR_DOMAIN_CONTROLLER_TYPE_IDE: case VIR_DOMAIN_CONTROLLER_TYPE_FDC: - case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: case VIR_DOMAIN_CONTROLLER_TYPE_CCID: case VIR_DOMAIN_CONTROLLER_TYPE_XENBUS: @@ -1087,6 +1149,8 @@ virBhyveProcessBuildCustomLoaderCmd(virDomainDef *def) static bool virBhyveUsableDisk(virDomainDiskDef *disk) { + virStorageType disk_type =3D virDomainDiskGetType(disk); + if (virDomainDiskTranslateSourcePool(disk) < 0) return false; =20 @@ -1097,8 +1161,9 @@ virBhyveUsableDisk(virDomainDiskDef *disk) return false; } =20 - if ((virDomainDiskGetType(disk) !=3D VIR_STORAGE_TYPE_FILE) && - (virDomainDiskGetType(disk) !=3D VIR_STORAGE_TYPE_VOLUME)) { + if ((disk_type !=3D VIR_STORAGE_TYPE_FILE) && + (disk_type !=3D VIR_STORAGE_TYPE_VOLUME) && + (disk_type !=3D VIR_STORAGE_TYPE_CTL)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("unsupported disk type")); return false; diff --git a/src/bhyve/bhyve_device.c b/src/bhyve/bhyve_device.c index ead52ae704..28a9c82d7b 100644 --- a/src/bhyve/bhyve_device.c +++ b/src/bhyve/bhyve_device.c @@ -115,6 +115,7 @@ bhyveAssignDevicePCISlots(virDomainDef *def, if ((def->controllers[i]->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_P= CI) || (def->controllers[i]->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_S= ATA) || (def->controllers[i]->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_N= VME) || + (def->controllers[i]->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_S= CSI) || ((def->controllers[i]->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_= USB) && (def->controllers[i]->model =3D=3D VIR_DOMAIN_CONTROLLER_MODE= L_USB_NEC_XHCI)) || def->controllers[i]->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_IS= A) { diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-scsi.args b/tests= /bhyvexml2argvdata/bhyvexml2argv-virtio-scsi.args new file mode 100644 index 0000000000..295c528135 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-scsi.args @@ -0,0 +1,10 @@ +bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 2:0,virtio-scsi,/dev/cam/ctl \ +-s 3:0,virtio-net,faketapdev,mac=3D52:54:00:b9:94:02 \ +bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-scsi.ldargs b/tes= ts/bhyvexml2argvdata/bhyvexml2argv-virtio-scsi.ldargs new file mode 100644 index 0000000000..06a51ead59 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-scsi.ldargs @@ -0,0 +1,4 @@ +bhyveload \ +-m 214 \ +-d /dev/cam/ctl \ +bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-scsi.xml b/tests/= bhyvexml2argvdata/bhyvexml2argv-virtio-scsi.xml new file mode 100644 index 0000000000..d8c10afe6d --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-scsi.xml @@ -0,0 +1,21 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 1 + + hvm + + + + + + + + + + +
+ + + diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index b83051d3cd..c6d58821ac 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -273,6 +273,7 @@ mymain(void) DO_TEST("slirp"); DO_TEST("slirp-mac-addr"); DO_TEST_FAILURE("slirp-ip"); + DO_TEST("virtio-scsi"); =20 /* Address allocation tests */ DO_TEST("addr-single-sata-disk"); diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-virtio-scsi.xml b/te= sts/bhyvexml2xmloutdata/bhyvexml2xmlout-virtio-scsi.xml new file mode 100644 index 0000000000..94915ea8b7 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-virtio-scsi.xml @@ -0,0 +1,32 @@ + + bhyve + df3be7e7-a104-11e3-aeb0-50e5492bd3dc + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + + + +
+ + + +
+ + + + + +
+ + + diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index 0abc50b0de..8eecd5bf68 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -123,6 +123,7 @@ mymain(void) DO_TEST_DIFFERENT("2-nvme-2-controllers"); DO_TEST_DIFFERENT("passthru-multiple-devs"); DO_TEST_DIFFERENT("slirp"); + DO_TEST_DIFFERENT("virtio-scsi"); =20 /* Address allocation tests */ DO_TEST_DIFFERENT("addr-single-sata-disk"); --=20 2.52.0