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:
<disk type='ctl'>
<source dev='/dev/cam/ctl'/>
<target dev='sda' bus='scsi'/>
</disk>
Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com>
---
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.xml
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;
}
+static int
+bhyveBuildSCSIControllerArgStr(const virDomainDef *def,
+ virDomainControllerDef *controller,
+ struct _bhyveConn *driver G_GNUC_UNUSED,
+ virCommand *cmd)
+{
+ g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
+ const char *disk_source;
+ size_t i;
+
+ for (i = 0; i < def->ndisks; i++) {
+ g_auto(virBuffer) device = VIR_BUFFER_INITIALIZER;
+ virDomainDiskDef *disk = def->disks[i];
+
+ if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI)
+ continue;
+
+ if (disk->info.addr.drive.controller != controller->idx)
+ continue;
+
+ VIR_DEBUG("disk %zu controller %d", i, controller->idx);
+
+ if (virDomainDiskGetType(disk) != VIR_STORAGE_TYPE_CTL) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("unsupported disk type"));
+ return -1;
+ }
+
+ if (virDomainDiskTranslateSourcePool(disk) < 0)
+ return -1;
+
+ disk_source = virDomainDiskGetSource(disk);
+
+ if ((disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) &&
+ (disk_source == NULL)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("cdrom device without source path not supported"));
+ return -1;
+ }
+
+ if (disk->device != 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 = virDomainDiskGetType(disk);
+
if (virDomainDiskTranslateSourcePool(disk) < 0)
return false;
@@ -1097,8 +1161,9 @@ virBhyveUsableDisk(virDomainDiskDef *disk)
return false;
}
- if ((virDomainDiskGetType(disk) != VIR_STORAGE_TYPE_FILE) &&
- (virDomainDiskGetType(disk) != VIR_STORAGE_TYPE_VOLUME)) {
+ if ((disk_type != VIR_STORAGE_TYPE_FILE) &&
+ (disk_type != VIR_STORAGE_TYPE_VOLUME) &&
+ (disk_type != 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 == VIR_DOMAIN_CONTROLLER_TYPE_PCI) ||
(def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_SATA) ||
(def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_NVME) ||
+ (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) ||
((def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_USB) &&
(def->controllers[i]->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI)) ||
def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_ISA) {
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=52:54:00:b9:94:02 \
+bhyve
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-virtio-scsi.ldargs b/tests/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 @@
+<domain type='bhyve'>
+ <name>bhyve</name>
+ <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+ <memory>219136</memory>
+ <vcpu>1</vcpu>
+ <os>
+ <type>hvm</type>
+ </os>
+ <devices>
+ <disk type='ctl'>
+ <source dev='/dev/cam/ctl'/>
+ <target dev='sda' bus='scsi'/>
+ </disk>
+ <interface type='bridge'>
+ <mac address='52:54:00:b9:94:02'/>
+ <model type='virtio'/>
+ <source bridge="virbr0"/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
+ </interface>
+ </devices>
+</domain>
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");
/* Address allocation tests */
DO_TEST("addr-single-sata-disk");
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-virtio-scsi.xml b/tests/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 @@
+<domain type='bhyve'>
+ <name>bhyve</name>
+ <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='x86_64'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <disk type='ctl' device='disk'>
+ <source dev='/dev/cam/ctl'/>
+ <target dev='sda' bus='scsi'/>
+ <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+ </disk>
+ <controller type='pci' index='0' model='pci-root'/>
+ <controller type='scsi' index='0'>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+ </controller>
+ <interface type='bridge'>
+ <mac address='52:54:00:b9:94:02'/>
+ <source bridge='virbr0'/>
+ <model type='virtio'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
+ </interface>
+ </devices>
+</domain>
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");
/* Address allocation tests */
DO_TEST_DIFFERENT("addr-single-sata-disk");
--
2.52.0© 2016 - 2026 Red Hat, Inc.