diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 222a9386f6..6b3e892332 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -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")); diff --git a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args index b24b2c0b4f..30acd7c78b 100644 --- a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args @@ -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 \ diff --git a/tests/qemuxml2argvdata/disk-vhostuser.xml b/tests/qemuxml2argvdata/disk-vhostuser.xml index c96ef9119c..cbe2804e39 100644 --- a/tests/qemuxml2argvdata/disk-vhostuser.xml +++ b/tests/qemuxml2argvdata/disk-vhostuser.xml @@ -20,7 +20,7 @@ - + diff --git a/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml index 9712dc0b12..87f5ec46ac 100644 --- a/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml @@ -28,7 +28,7 @@
- +