External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: allow virtio driver attributes for vhostuser disk

Browse Source 
All of these options are actually supported by vhostuser disk so
we should allow them to be usable.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Pavel Hrdina 2021-02-05 13:05:54 +01:00
parent a58edc602e
commit d3f4f01fa7
4 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/conf/domain_validate.c
View File

@ -322,26 +322,6 @@ virDomainDiskVhostUserValidate(const virDomainDiskDef *disk)
/* Unsupported driver elements */
if (disk->virtio) {
if (disk->virtio->iommu != VIR_TRISTATE_SWITCH_ABSENT) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("iommu is not supported with vhostuser disk"));
return -1;
}
if (disk->virtio->ats != VIR_TRISTATE_SWITCH_ABSENT) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("ats is not supported with vhostuser disk"));
return -1;
}
if (disk->virtio->packed != VIR_TRISTATE_SWITCH_ABSENT) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("packed is not supported with vhostuser disk"));
return -1;
}
}
if (disk->src->metadataCacheMaxSize > 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("metadata_cache is not supported with vhostuser disk"));

4
tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args
View File

@ -33,8 +33,8 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-device vhost-user-blk-pci,bus=pci.0,addr=0x2,chardev=chr-vu-virtio-disk0,\
id=virtio-disk0,bootindex=1 \
-chardev socket,id=chr-vu-virtio-disk1,path=/tmp/vhost1.sock,reconnect=10 \
-device vhost-user-blk-pci,bus=pci.0,addr=0x3,chardev=chr-vu-virtio-disk1,\
id=virtio-disk1 \
-device vhost-user-blk-pci,iommu_platform=on,ats=on,packed=on,bus=pci.0,\
addr=0x3,chardev=chr-vu-virtio-disk1,id=virtio-disk1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \

2
tests/qemuxml2argvdata/disk-vhostuser.xml
View File

@ -20,7 +20,7 @@
<boot order='1'/>
</disk>
<disk type='vhostuser' device='disk'>
<driver name='qemu' type='raw'/>
<driver name='qemu' type='raw' iommu='on' ats='on' packed='on'/>
<source type='unix' path='/tmp/vhost1.sock'>
<reconnect enabled='yes' timeout='10'/>
</source>

2
tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml
View File

@ -28,7 +28,7 @@
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</disk>
<disk type='vhostuser' device='disk' snapshot='no'>
<driver name='qemu' type='raw'/>
<driver name='qemu' type='raw' iommu='on' ats='on' packed='on'/>
<source type='unix' path='/tmp/vhost1.sock'>
<reconnect enabled='yes' timeout='10'/>
</source>