[PATCH 0/4] bhyve: disk-related fixes
This series includes a few relatively small disk related improvmenets. Roman Bogorodskiy (4): bhyve: respect <readonly/> for disks bhyve: support additional attributes for disks bhyve: support disk type='block' bhyve: honor PCI functions for disk controllers src/bhyve/bhyve_command.c | 53 ++++++++++++++----- src/bhyve/bhyve_domain.c | 18 ++++++- .../bhyvexml2argv-bhyveload-bootorder.args | 2 +- .../bhyvexml2argv-bhyveload-bootorder1.args | 2 +- .../bhyvexml2argv-bhyveload-bootorder3.args | 2 +- .../x86_64/bhyvexml2argv-disk-block.args | 13 +++++ .../x86_64/bhyvexml2argv-disk-block.ldargs | 1 + .../x86_64/bhyvexml2argv-disk-block.xml | 27 ++++++++++ .../bhyvexml2argv-disk-blockio-invalid.xml | 17 ++++++ .../x86_64/bhyvexml2argv-disk-cdrom-grub.args | 2 +- .../x86_64/bhyvexml2argv-disk-cdrom.args | 2 +- .../x86_64/bhyvexml2argv-disk-options.args | 11 ++++ .../x86_64/bhyvexml2argv-disk-options.ldargs | 4 ++ .../x86_64/bhyvexml2argv-disk-options.xml | 41 ++++++++++++++ .../x86_64/bhyvexml2argv-disk-pci-addr.args | 12 +++++ .../x86_64/bhyvexml2argv-disk-pci-addr.ldargs | 4 ++ .../x86_64/bhyvexml2argv-disk-pci-addr.xml | 40 ++++++++++++++ .../x86_64/bhyvexml2argv-disk-readonly.args | 11 ++++ .../x86_64/bhyvexml2argv-disk-readonly.ldargs | 4 ++ .../x86_64/bhyvexml2argv-disk-readonly.xml | 40 ++++++++++++++ tests/bhyvexml2argvtest.c | 5 ++ .../x86_64/bhyvexml2xmlout-disk-block.xml | 46 ++++++++++++++++ .../x86_64/bhyvexml2xmlout-disk-pci-addr.xml | 50 +++++++++++++++++ tests/bhyvexml2xmltest.c | 2 + 24 files changed, 390 insertions(+), 19 deletions(-) create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-block.args create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-block.ldargs create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-block.xml create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-blockio-invalid.xml create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-options.args create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-options.ldargs create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-options.xml create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-pci-addr.args create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-pci-addr.ldargs create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-pci-addr.xml create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.args create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.ldargs create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.xml create mode 100644 tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-disk-block.xml create mode 100644 tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-disk-pci-addr.xml -- 2.55.0
bhyve supports marking disks "readonly" using the "ro" parameter. Update AHCI, NVMe, and virtio-blk command generation to add this parameter when <readonly/> is specified. Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com> --- src/bhyve/bhyve_command.c | 9 ++++- .../bhyvexml2argv-bhyveload-bootorder.args | 2 +- .../bhyvexml2argv-bhyveload-bootorder1.args | 2 +- .../bhyvexml2argv-bhyveload-bootorder3.args | 2 +- .../x86_64/bhyvexml2argv-disk-cdrom-grub.args | 2 +- .../x86_64/bhyvexml2argv-disk-cdrom.args | 2 +- .../x86_64/bhyvexml2argv-disk-readonly.args | 11 +++++ .../x86_64/bhyvexml2argv-disk-readonly.ldargs | 4 ++ .../x86_64/bhyvexml2argv-disk-readonly.xml | 40 +++++++++++++++++++ tests/bhyvexml2argvtest.c | 1 + 10 files changed, 69 insertions(+), 6 deletions(-) create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.args create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.ldargs create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.xml diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 7e3d3d4553..31ea9d6740 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -369,6 +369,9 @@ bhyveBuildAHCIControllerArgStr(const virDomainDef *def, if (disk->info.bootIndex != 0) virBufferAsprintf(&device, ",bootindex=%u", disk->info.bootIndex); + if (disk->src->readonly) + virBufferAddLit(&device, ",ro"); + virBufferAddBuffer(&buf, &device); } @@ -391,7 +394,6 @@ bhyveBuildSCSIControllerArgStr(const virDomainDef *def, 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) @@ -518,6 +520,8 @@ bhyveBuildNVMeControllerArgStr(const virDomainDef *def, disk->wwn); if (controller->opts.nvmeopts.serial) virBufferAsprintf(&opt, ",ser=%s", controller->opts.nvmeopts.serial); + if (disk->src->readonly) + virBufferAddLit(&opt, ",ro"); nvme_opts = virBufferContentAndReset(&opt); @@ -600,6 +604,9 @@ bhyveBuildVirtIODiskArgStr(const virDomainDef *def G_GNUC_UNUSED, if (disk->info.bootIndex != 0) virBufferAsprintf(&opts, ",bootindex=%u", disk->info.bootIndex); + if (disk->src->readonly) + virBufferAddLit(&opts, ",ro"); + virCommandAddArg(cmd, "-s"); virCommandAddArgFormat(cmd, "%d:0,virtio-blk,%s%s", disk->info.addr.pci.slot, diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder.args b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder.args index a6df2a673e..6ecc2ef181 100644 --- a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder.args +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder.args @@ -5,6 +5,6 @@ bhyve \ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,hd:/tmp/freebsd.img,cd:/tmp/cdrom.iso \ +-s 2:0,ahci,hd:/tmp/freebsd.img,cd:/tmp/cdrom.iso,ro \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:8d:10:e1 \ bhyve diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder1.args b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder1.args index f10304cc9f..e554ab84d4 100644 --- a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder1.args +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder1.args @@ -5,6 +5,6 @@ bhyve \ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,hd:/tmp/freebsd.img,cd:/tmp/cdrom.iso \ +-s 2:0,ahci,hd:/tmp/freebsd.img,cd:/tmp/cdrom.iso,ro \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:92:68:0e \ bhyve diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder3.args b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder3.args index bdcd73499b..2d78b21299 100644 --- a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder3.args +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-bhyveload-bootorder3.args @@ -5,6 +5,6 @@ bhyve \ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,hd:/tmp/freebsd.img,cd:/tmp/cdrom.iso,bootindex=1 \ +-s 2:0,ahci,hd:/tmp/freebsd.img,cd:/tmp/cdrom.iso,bootindex=1,ro \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:7a:f5:a4 \ bhyve diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom-grub.args b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom-grub.args index f54ebbc8b3..64af5e8c09 100644 --- a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom-grub.args +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom-grub.args @@ -5,6 +5,6 @@ bhyve \ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,cd:/tmp/cdrom.iso \ +-s 2:0,ahci,cd:/tmp/cdrom.iso,ro \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:6f:6a:53 \ bhyve diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom.args b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom.args index ba6ddeffbe..a2f2ea8d71 100644 --- a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom.args +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-cdrom.args @@ -5,6 +5,6 @@ bhyve \ -H \ -P \ -s 0:0,hostbridge \ --s 2:0,ahci,cd:/tmp/cdrom.iso \ +-s 2:0,ahci,cd:/tmp/cdrom.iso,ro \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:e3:ec:9b \ bhyve diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.args b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.args new file mode 100644 index 0000000000..9cb5abc162 --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.args @@ -0,0 +1,11 @@ +bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 2:0,nvme,/tmp/nvme-readonly.img,maxq=2,qsz=256,eui64=0x01000000efbeadde,ser=BHYVE-NVME0-01234,ro \ +-s 3:0,ahci,hd:/tmp/sata-readonly.img,nmrr=7200,ser=BHYVE-SATA-RO,ro,hd:/tmp/sata-writable.img,nmrr=5400,ser=BHYVE-SATA-RW \ +-s 4:0,virtio-blk,/tmp/virtio-readonly.img,ro \ +bhyve diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.ldargs b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.ldargs new file mode 100644 index 0000000000..02a3ac0f73 --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.ldargs @@ -0,0 +1,4 @@ +bhyveload \ +-m 214 \ +-d /tmp/sata-readonly.img \ +bhyve diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.xml new file mode 100644 index 0000000000..2dbc1a9bd2 --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.xml @@ -0,0 +1,40 @@ +<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> + <controller type='nvme' index='0'> + <serial>BHYVE-NVME0-01234</serial> + </controller> + <disk type='file'> + <serial>BHYVE-SATA-RO</serial> + <driver name='file' type='raw'/> + <source file='/tmp/sata-readonly.img'/> + <target dev='hda' bus='sata' rotation_rate='7200'/> + <readonly/> + </disk> + <disk type='file'> + <serial>BHYVE-SATA-RW</serial> + <driver name='file' type='raw'/> + <source file='/tmp/sata-writable.img'/> + <target dev='hdb' bus='sata' rotation_rate='5400'/> + </disk> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/virtio-readonly.img'/> + <target dev='vda' bus='virtio'/> + <readonly/> + </disk> + <disk type='file'> + <driver name='file' type='raw' queues='2' queue_size='256'/> + <source file='/tmp/nvme-readonly.img'/> + <target dev='nvme0n1' bus='nvme'/> + <wwn>01000000efbeadde</wwn> + <readonly/> + </disk> + </devices> +</domain> diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index 0b700cc5b0..c208db6311 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -239,6 +239,7 @@ mymain(void) DO_TEST_FAILURE("acpiapic"); DO_TEST("disk-cdrom"); DO_TEST("disk-virtio"); + DO_TEST("disk-readonly"); DO_TEST("macaddr"); DO_TEST("serial"); DO_TEST("console"); -- 2.55.0
Support discard='ignore' configurations and logical and physical block sizes configured by <blockio/>. As these options are common to the storage backend, introduce a helper bhyveBuildCommonDiskOpts() to generate the command line for them. This also enables bootindex configuration for the NVMe devices. As bhyve uses 'int' for block sizes, discard values greater than INT_MAX. And as bhyve does not support specifying physical block size without specifying logical block size, reject these configurations too. Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com> --- src/bhyve/bhyve_command.c | 39 ++++++++++++------ src/bhyve/bhyve_domain.c | 18 +++++++- .../bhyvexml2argv-disk-blockio-invalid.xml | 17 ++++++++ .../x86_64/bhyvexml2argv-disk-options.args | 11 +++++ .../x86_64/bhyvexml2argv-disk-options.ldargs | 4 ++ .../x86_64/bhyvexml2argv-disk-options.xml | 41 +++++++++++++++++++ tests/bhyvexml2argvtest.c | 2 + 7 files changed, 118 insertions(+), 14 deletions(-) create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-blockio-invalid.xml create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-options.args create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-options.ldargs create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-options.xml diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 31ea9d6740..49c3101027 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -42,6 +42,28 @@ VIR_LOG_INIT("bhyve.bhyve_command"); +static void +bhyveBuildCommonDiskOpts(const virDomainDiskDef *disk, + virBuffer *opt) +{ + if (disk->info.bootIndex != 0) + virBufferAsprintf(opt, ",bootindex=%u", disk->info.bootIndex); + + if (disk->src->readonly) + virBufferAddLit(opt, ",ro"); + + if (disk->discard == VIR_DOMAIN_DISK_DISCARD_IGNORE) + virBufferAddLit(opt, ",nodelete"); + + if (disk->blockio.logical_block_size > 0) { + /* sectorsize=logical[/physical] */ + virBufferAsprintf(opt, ",sectorsize=%u", + disk->blockio.logical_block_size); + if (disk->blockio.physical_block_size > 0) + virBufferAsprintf(opt, "/%u", disk->blockio.physical_block_size); + } +} + static int bhyveBuildNetArgStr(const virDomainDef *def, virDomainNetDef *net, @@ -366,12 +388,7 @@ bhyveBuildAHCIControllerArgStr(const virDomainDef *def, if (disk->serial) virBufferAsprintf(&device, ",ser=%s", disk->serial); - if (disk->info.bootIndex != 0) - virBufferAsprintf(&device, ",bootindex=%u", disk->info.bootIndex); - - if (disk->src->readonly) - virBufferAddLit(&device, ",ro"); - + bhyveBuildCommonDiskOpts(disk, &device); virBufferAddBuffer(&buf, &device); } @@ -520,8 +537,8 @@ bhyveBuildNVMeControllerArgStr(const virDomainDef *def, disk->wwn); if (controller->opts.nvmeopts.serial) virBufferAsprintf(&opt, ",ser=%s", controller->opts.nvmeopts.serial); - if (disk->src->readonly) - virBufferAddLit(&opt, ",ro"); + + bhyveBuildCommonDiskOpts(disk, &opt); nvme_opts = virBufferContentAndReset(&opt); @@ -601,11 +618,7 @@ bhyveBuildVirtIODiskArgStr(const virDomainDef *def G_GNUC_UNUSED, disk_source = virDomainDiskGetSource(disk); - if (disk->info.bootIndex != 0) - virBufferAsprintf(&opts, ",bootindex=%u", disk->info.bootIndex); - - if (disk->src->readonly) - virBufferAddLit(&opts, ",ro"); + bhyveBuildCommonDiskOpts(disk, &opts); virCommandAddArg(cmd, "-s"); virCommandAddArgFormat(cmd, "%d:0,virtio-blk,%s%s", diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index 0ee2e06664..0d076fc08c 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -463,7 +463,8 @@ bhyveDomainDeviceDefValidate(const virDomainDeviceDef *dev, virDomainDiskDef *disk = dev->data.disk; if ((disk->bus == VIR_DOMAIN_DISK_BUS_SATA || - disk->bus == VIR_DOMAIN_DISK_BUS_VIRTIO) && + disk->bus == VIR_DOMAIN_DISK_BUS_VIRTIO || + disk->bus == VIR_DOMAIN_DISK_BUS_NVME) && disk->info.bootIndex > INT_MAX) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("boot order '%1$u' is greater than bhyve's maximum of %2$d"), @@ -493,6 +494,21 @@ bhyveDomainDeviceDefValidate(const virDomainDeviceDef *dev, } } + if (disk->blockio.physical_block_size > INT_MAX || + disk->blockio.logical_block_size > INT_MAX) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("block size is greater than bhyve's maximum of %1$d"), + INT_MAX); + return -1; + } + + if (disk->blockio.physical_block_size > 0 && + disk->blockio.logical_block_size == 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Setting physical block size without logical block size is not supported")); + return -1; + } + break; } case VIR_DOMAIN_DEVICE_NET: { diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-blockio-invalid.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-blockio-invalid.xml new file mode 100644 index 0000000000..5e46276602 --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-blockio-invalid.xml @@ -0,0 +1,17 @@ +<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='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <blockio physical_block_size='4096'/> + </disk> + </devices> +</domain> diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-options.args b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-options.args new file mode 100644 index 0000000000..2d82a4c6fc --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-options.args @@ -0,0 +1,11 @@ +bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 2:0,nvme,/tmp/nvme-ignore.img,maxq=2,qsz=256,eui64=0x01000000efbeadde,ser=BHYVE-NVME0-01234,nodelete,sectorsize=4096/4096 \ +-s 3:0,ahci,hd:/tmp/sata-ignore.img,nmrr=7200,ser=BHYVE-SATA-IGNORE,nodelete,sectorsize=512/4096,hd:/tmp/sata-unmap.img,nmrr=5400,ser=BHYVE-SATA-UNMAP,sectorsize=4096 \ +-s 4:0,virtio-blk,/tmp/virtio-ignore.img,nodelete,sectorsize=512/4096 \ +bhyve diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-options.ldargs b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-options.ldargs new file mode 100644 index 0000000000..b5e7d06c0a --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-options.ldargs @@ -0,0 +1,4 @@ +bhyveload \ +-m 214 \ +-d /tmp/sata-ignore.img \ +bhyve diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-options.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-options.xml new file mode 100644 index 0000000000..448fba92bd --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-options.xml @@ -0,0 +1,41 @@ +<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> + <controller type='nvme' index='0'> + <serial>BHYVE-NVME0-01234</serial> + </controller> + <disk type='file'> + <serial>BHYVE-SATA-IGNORE</serial> + <driver name='file' type='raw' discard='ignore'/> + <source file='/tmp/sata-ignore.img'/> + <target dev='hda' bus='sata' rotation_rate='7200'/> + <blockio logical_block_size='512' physical_block_size='4096'/> + </disk> + <disk type='file'> + <serial>BHYVE-SATA-UNMAP</serial> + <driver name='file' type='raw' discard='unmap'/> + <source file='/tmp/sata-unmap.img'/> + <target dev='hdb' bus='sata' rotation_rate='5400'/> + <blockio logical_block_size='4096'/> + </disk> + <disk type='file'> + <driver name='file' type='raw' discard='ignore'/> + <source file='/tmp/virtio-ignore.img'/> + <target dev='vda' bus='virtio'/> + <blockio logical_block_size='512' physical_block_size='4096'/> + </disk> + <disk type='file'> + <driver name='file' type='raw' discard='ignore' queues='2' queue_size='256'/> + <source file='/tmp/nvme-ignore.img'/> + <target dev='nvme0n1' bus='nvme'/> + <wwn>01000000efbeadde</wwn> + <blockio logical_block_size='4096' physical_block_size='4096'/> + </disk> + </devices> +</domain> diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index c208db6311..28b5ee981b 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -240,6 +240,8 @@ mymain(void) DO_TEST("disk-cdrom"); DO_TEST("disk-virtio"); DO_TEST("disk-readonly"); + DO_TEST("disk-options"); + DO_TEST_FAILURE("disk-blockio-invalid"); DO_TEST("macaddr"); DO_TEST("serial"); DO_TEST("console"); -- 2.55.0
The bhyve driver currently rejects <disk type='block'> configurations for AHCI and virtio-blk disks, though bhyve supports them: From the bhyve(8) manual page: Block storage device backends: • /filename[,block-device-options] • /dev/xxx[,block-device-options] Thus, relax disk type checks and permit these configurations. Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com> --- src/bhyve/bhyve_command.c | 9 ++-- .../x86_64/bhyvexml2argv-disk-block.args | 13 ++++++ .../x86_64/bhyvexml2argv-disk-block.ldargs | 1 + .../x86_64/bhyvexml2argv-disk-block.xml | 27 +++++++++++ tests/bhyvexml2argvtest.c | 1 + .../x86_64/bhyvexml2xmlout-disk-block.xml | 46 +++++++++++++++++++ tests/bhyvexml2xmltest.c | 1 + 7 files changed, 95 insertions(+), 3 deletions(-) create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-block.args create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-block.ldargs create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-block.xml create mode 100644 tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-disk-block.xml diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 49c3101027..f5ee2b041f 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -341,7 +341,8 @@ bhyveBuildAHCIControllerArgStr(const virDomainDef *def, VIR_DEBUG("disk %zu controller %d", i, controller->idx); - if ((virDomainDiskGetType(disk) != VIR_STORAGE_TYPE_FILE) && + if ((virDomainDiskGetType(disk) != VIR_STORAGE_TYPE_BLOCK) && + (virDomainDiskGetType(disk) != VIR_STORAGE_TYPE_FILE) && (virDomainDiskGetType(disk) != VIR_STORAGE_TYPE_VOLUME)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("unsupported disk type")); @@ -609,7 +610,8 @@ bhyveBuildVirtIODiskArgStr(const virDomainDef *def G_GNUC_UNUSED, return -1; } - if ((virDomainDiskGetType(disk) != VIR_STORAGE_TYPE_FILE) && + if ((virDomainDiskGetType(disk) != VIR_STORAGE_TYPE_BLOCK) && + (virDomainDiskGetType(disk) != VIR_STORAGE_TYPE_FILE) && (virDomainDiskGetType(disk) != VIR_STORAGE_TYPE_VOLUME)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("unsupported disk type")); @@ -1524,7 +1526,8 @@ virBhyveUsableDisk(virDomainDiskDef *disk) return false; } - if ((disk_type != VIR_STORAGE_TYPE_FILE) && + if ((disk_type != VIR_STORAGE_TYPE_BLOCK) && + (disk_type != VIR_STORAGE_TYPE_FILE) && (disk_type != VIR_STORAGE_TYPE_VOLUME) && (disk_type != VIR_STORAGE_TYPE_CTL)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-block.args b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-block.args new file mode 100644 index 0000000000..64c3aca2a0 --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-block.args @@ -0,0 +1,13 @@ +bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-l bootrom,/path/to/test.fd,fwcfg=qemu \ +-s 1:0,lpc \ +-s 2:0,ahci,hd:/dev/zvol/zroot/bhyve-sata \ +-s 3:0,nvme,/dev/zvol/zroot/bhyve-nvme \ +-s 4:0,virtio-blk,/dev/zvol/zroot/bhyve-virtio \ +bhyve diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-block.ldargs b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-block.ldargs new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-block.ldargs @@ -0,0 +1 @@ +dummy diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-block.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-block.xml new file mode 100644 index 0000000000..7ba7450f20 --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-block.xml @@ -0,0 +1,27 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + <loader readonly='yes' type='pflash'>/path/to/test.fd</loader> + </os> + <devices> + <disk type='block'> + <driver name='file' type='raw'/> + <source dev='/dev/zvol/zroot/bhyve-sata'/> + <target dev='hda' bus='sata'/> + </disk> + <disk type='block'> + <driver name='file' type='raw'/> + <source dev='/dev/zvol/zroot/bhyve-virtio'/> + <target dev='vda' bus='virtio'/> + </disk> + <disk type='block'> + <driver name='file' type='raw'/> + <source dev='/dev/zvol/zroot/bhyve-nvme'/> + <target dev='nvme0n1' bus='nvme'/> + </disk> + </devices> +</domain> diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index 28b5ee981b..c86929b308 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -237,6 +237,7 @@ mymain(void) DO_TEST("acpiapic"); virBhyveCapsClear(driver.bhyvecaps, BHYVE_CAP_ACPI); DO_TEST_FAILURE("acpiapic"); + DO_TEST("disk-block"); DO_TEST("disk-cdrom"); DO_TEST("disk-virtio"); DO_TEST("disk-readonly"); diff --git a/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-disk-block.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-disk-block.xml new file mode 100644 index 0000000000..553695dec9 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-disk-block.xml @@ -0,0 +1,46 @@ +<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> + <loader readonly='yes' type='pflash'>/path/to/test.fd</loader> + <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='block' device='disk'> + <driver name='file' type='raw'/> + <source dev='/dev/zvol/zroot/bhyve-sata'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='block' device='disk'> + <driver name='file' type='raw'/> + <source dev='/dev/zvol/zroot/bhyve-virtio'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <disk type='block' device='disk'> + <driver name='file' type='raw'/> + <source dev='/dev/zvol/zroot/bhyve-nvme'/> + <target dev='nvme0n1' bus='nvme'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='pci' index='0' model='pci-root'/> + <controller type='isa' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> + </controller> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </controller> + <controller type='nvme' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </controller> + </devices> +</domain> diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index 724ba4d85f..208d87b280 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -111,6 +111,7 @@ mymain(void) DO_TEST_DIFFERENT("console"); DO_TEST_DIFFERENT("console-master-slave-not-specified"); DO_TEST_DIFFERENT("custom-loader"); + DO_TEST_DIFFERENT("disk-block"); DO_TEST_DIFFERENT("disk-cdrom"); DO_TEST_DIFFERENT("disk-cdrom-grub"); DO_TEST_DIFFERENT("disk-virtio"); -- 2.55.0
Currently, the bhyve driver hardcodes PCI function 0 for several controllers, specifically: ahci, virtio-blk, virtio-scsi, and nvme. There is no specific reason for that, so use the configured PCI function instead. Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com> --- src/bhyve/bhyve_command.c | 12 +++-- .../x86_64/bhyvexml2argv-disk-pci-addr.args | 12 +++++ .../x86_64/bhyvexml2argv-disk-pci-addr.ldargs | 4 ++ .../x86_64/bhyvexml2argv-disk-pci-addr.xml | 40 +++++++++++++++ tests/bhyvexml2argvtest.c | 1 + .../x86_64/bhyvexml2xmlout-disk-pci-addr.xml | 50 +++++++++++++++++++ tests/bhyvexml2xmltest.c | 1 + 7 files changed, 116 insertions(+), 4 deletions(-) create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-pci-addr.args create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-pci-addr.ldargs create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-pci-addr.xml create mode 100644 tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-disk-pci-addr.xml diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index f5ee2b041f..be66d26c50 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -394,8 +394,9 @@ bhyveBuildAHCIControllerArgStr(const virDomainDef *def, } virCommandAddArg(cmd, "-s"); - virCommandAddArgFormat(cmd, "%d:0,ahci%s", + virCommandAddArgFormat(cmd, "%d:%d,ahci%s", controller->info.addr.pci.slot, + controller->info.addr.pci.function, virBufferCurrentContent(&buf)); return 0; @@ -447,8 +448,9 @@ bhyveBuildSCSIControllerArgStr(const virDomainDef *def, } virCommandAddArg(cmd, "-s"); - virCommandAddArgFormat(cmd, "%d:0,virtio-scsi,%s", + virCommandAddArgFormat(cmd, "%d:%d,virtio-scsi,%s", controller->info.addr.pci.slot, + controller->info.addr.pci.function, virDomainDiskGetSource(disk)); return 0; @@ -544,8 +546,9 @@ bhyveBuildNVMeControllerArgStr(const virDomainDef *def, nvme_opts = virBufferContentAndReset(&opt); virCommandAddArg(cmd, "-s"); - virCommandAddArgFormat(cmd, "%d:0,nvme,%s%s", + virCommandAddArgFormat(cmd, "%d:%d,nvme,%s%s", controller->info.addr.pci.slot, + controller->info.addr.pci.function, disk_source, NULLSTR_EMPTY(nvme_opts)); @@ -623,8 +626,9 @@ bhyveBuildVirtIODiskArgStr(const virDomainDef *def G_GNUC_UNUSED, bhyveBuildCommonDiskOpts(disk, &opts); virCommandAddArg(cmd, "-s"); - virCommandAddArgFormat(cmd, "%d:0,virtio-blk,%s%s", + virCommandAddArgFormat(cmd, "%d:%d,virtio-blk,%s%s", disk->info.addr.pci.slot, + disk->info.addr.pci.function, disk_source, virBufferCurrentContent(&opts)); diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-pci-addr.args b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-pci-addr.args new file mode 100644 index 0000000000..8d171d5c2a --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-pci-addr.args @@ -0,0 +1,12 @@ +bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 2:1,ahci,hd:/tmp/sata.img \ +-s 3:2,virtio-scsi,/dev/cam/ctl \ +-s 4:3,nvme,/tmp/nvme.img \ +-s 5:4,virtio-blk,/tmp/virtio.img \ +bhyve diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-pci-addr.ldargs b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-pci-addr.ldargs new file mode 100644 index 0000000000..efd5638b23 --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-pci-addr.ldargs @@ -0,0 +1,4 @@ +bhyveload \ +-m 214 \ +-d /tmp/sata.img \ +bhyve diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-pci-addr.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-pci-addr.xml new file mode 100644 index 0000000000..48f45ff1dd --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-pci-addr.xml @@ -0,0 +1,40 @@ +<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> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/> + </controller> + <controller type='scsi' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/> + </controller> + <controller type='nvme' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x3'/> + </controller> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/sata.img'/> + <target dev='hda' bus='sata'/> + </disk> + <disk type='ctl'> + <source dev='/dev/cam/ctl'/> + <target dev='sda' bus='scsi'/> + </disk> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/nvme.img'/> + <target dev='nvme0n1' bus='nvme'/> + </disk> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/virtio.img'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x4'/> + </disk> + </devices> +</domain> diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index c86929b308..f5df8a0265 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -240,6 +240,7 @@ mymain(void) DO_TEST("disk-block"); DO_TEST("disk-cdrom"); DO_TEST("disk-virtio"); + DO_TEST("disk-pci-addr"); DO_TEST("disk-readonly"); DO_TEST("disk-options"); DO_TEST_FAILURE("disk-blockio-invalid"); diff --git a/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-disk-pci-addr.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-disk-pci-addr.xml new file mode 100644 index 0000000000..67a78a51e3 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-disk-pci-addr.xml @@ -0,0 +1,50 @@ +<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='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/sata.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <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> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/nvme.img'/> + <target dev='nvme0n1' bus='nvme'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/virtio.img'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x4'/> + </disk> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/> + </controller> + <controller type='scsi' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/> + </controller> + <controller type='nvme' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x3'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + </devices> +</domain> diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index 208d87b280..03cdb5dd92 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -112,6 +112,7 @@ mymain(void) DO_TEST_DIFFERENT("console-master-slave-not-specified"); DO_TEST_DIFFERENT("custom-loader"); DO_TEST_DIFFERENT("disk-block"); + DO_TEST_DIFFERENT("disk-pci-addr"); DO_TEST_DIFFERENT("disk-cdrom"); DO_TEST_DIFFERENT("disk-cdrom-grub"); DO_TEST_DIFFERENT("disk-virtio"); -- 2.55.0
On Fri, Nov 06, 2026 at 19:48:21 +0100, Roman Bogorodskiy wrote:
This series includes a few relatively small disk related improvmenets.
Roman Bogorodskiy (4): bhyve: respect <readonly/> for disks bhyve: support additional attributes for disks bhyve: support disk type='block' bhyve: honor PCI functions for disk controllers
src/bhyve/bhyve_command.c | 53 ++++++++++++++----- src/bhyve/bhyve_domain.c | 18 ++++++- .../bhyvexml2argv-bhyveload-bootorder.args | 2 +- .../bhyvexml2argv-bhyveload-bootorder1.args | 2 +- .../bhyvexml2argv-bhyveload-bootorder3.args | 2 +- .../x86_64/bhyvexml2argv-disk-block.args | 13 +++++ .../x86_64/bhyvexml2argv-disk-block.ldargs | 1 + .../x86_64/bhyvexml2argv-disk-block.xml | 27 ++++++++++ .../bhyvexml2argv-disk-blockio-invalid.xml | 17 ++++++ .../x86_64/bhyvexml2argv-disk-cdrom-grub.args | 2 +- .../x86_64/bhyvexml2argv-disk-cdrom.args | 2 +- .../x86_64/bhyvexml2argv-disk-options.args | 11 ++++ .../x86_64/bhyvexml2argv-disk-options.ldargs | 4 ++ .../x86_64/bhyvexml2argv-disk-options.xml | 41 ++++++++++++++ .../x86_64/bhyvexml2argv-disk-pci-addr.args | 12 +++++ .../x86_64/bhyvexml2argv-disk-pci-addr.ldargs | 4 ++ .../x86_64/bhyvexml2argv-disk-pci-addr.xml | 40 ++++++++++++++ .../x86_64/bhyvexml2argv-disk-readonly.args | 11 ++++ .../x86_64/bhyvexml2argv-disk-readonly.ldargs | 4 ++ .../x86_64/bhyvexml2argv-disk-readonly.xml | 40 ++++++++++++++ tests/bhyvexml2argvtest.c | 5 ++ .../x86_64/bhyvexml2xmlout-disk-block.xml | 46 ++++++++++++++++ .../x86_64/bhyvexml2xmlout-disk-pci-addr.xml | 50 +++++++++++++++++ tests/bhyvexml2xmltest.c | 2 + 24 files changed, 390 insertions(+), 19 deletions(-) create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-block.args create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-block.ldargs create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-block.xml create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-blockio-invalid.xml create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-options.args create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-options.ldargs create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-options.xml create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-pci-addr.args create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-pci-addr.ldargs create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-pci-addr.xml create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.args create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.ldargs create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-disk-readonly.xml create mode 100644 tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-disk-block.xml create mode 100644 tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-disk-pci-addr.xml
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
participants (2)
-
Jiri Denemark -
Roman Bogorodskiy