[PATCH] qemuxmlconftest: Test 'page_per_vq' config option for 'vhostuser' backed disk

Add a missing option for the test to prove that we parse/format this option. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- Added to see whether the claim in https://gitlab.com/libvirt/libvirt/-/issues/627 is true as I was fairly certain that virtio options are parsed commonly and thus this should 'Just work'. tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-4.2.0.args | 2 +- tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-4.2.0.xml | 2 +- tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/disk-vhostuser-numa.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-4.2.0.args b/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-4.2.0.args index 7522be4582..2f52151245 100644 --- a/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-4.2.0.args +++ b/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-4.2.0.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -chardev socket,id=chr-vu-virtio-disk0,path=/tmp/vhost1.sock \ -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,iommu_platform=on,ats=on,packed=on,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,page-per-vq=on,bus=pci.0,addr=0x3,chardev=chr-vu-virtio-disk1,id=virtio-disk1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -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/qemuxmlconfdata/disk-vhostuser-numa.x86_64-4.2.0.xml b/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-4.2.0.xml index f1825f3a8d..d020923bc7 100644 --- a/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-4.2.0.xml +++ b/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-4.2.0.xml @@ -27,7 +27,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' iommu='on' ats='on' packed='on'/> + <driver name='qemu' type='raw' iommu='on' ats='on' packed='on' page_per_vq='on'/> <source type='unix' path='/tmp/vhost1.sock'> <reconnect enabled='yes' timeout='10'/> </source> diff --git a/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.args b/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.args index cbe9f9ef48..48bb792206 100644 --- a/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -chardev socket,id=chr-vu-virtio-disk0,path=/tmp/vhost1.sock \ -device '{"driver":"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 '{"driver":"vhost-user-blk-pci","iommu_platform":true,"ats":true,"packed":true,"bus":"pci.0","addr":"0x3","chardev":"chr-vu-virtio-disk1","id":"virtio-disk1"}' \ +-device '{"driver":"vhost-user-blk-pci","iommu_platform":true,"ats":true,"packed":true,"page-per-vq":true,"bus":"pci.0","addr":"0x3","chardev":"chr-vu-virtio-disk1","id":"virtio-disk1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.xml index 0a2e40f496..9b62de174a 100644 --- a/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.xml @@ -27,7 +27,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' iommu='on' ats='on' packed='on'/> + <driver name='qemu' type='raw' iommu='on' ats='on' packed='on' page_per_vq='on'/> <source type='unix' path='/tmp/vhost1.sock'> <reconnect enabled='yes' timeout='10'/> </source> diff --git a/tests/qemuxmlconfdata/disk-vhostuser-numa.xml b/tests/qemuxmlconfdata/disk-vhostuser-numa.xml index 49efbae0a2..2b72bac4a3 100644 --- a/tests/qemuxmlconfdata/disk-vhostuser-numa.xml +++ b/tests/qemuxmlconfdata/disk-vhostuser-numa.xml @@ -22,7 +22,7 @@ <boot order='1'/> </disk> <disk type='vhostuser' device='disk'> - <driver name='qemu' type='raw' iommu='on' ats='on' packed='on'/> + <driver name='qemu' type='raw' iommu='on' ats='on' packed='on' page_per_vq='on'/> <source type='unix' path='/tmp/vhost1.sock'> <reconnect enabled='yes' timeout='10'/> </source> -- 2.44.0