On Wed, Nov 29, 2023 at 21:07:25 -0700, Vivek Kashyap wrote:
> Add related test cases
>
> Signed-off-by: Vivek Kashyap <vivek.kashyap@xxxxxxxxxxxxxxx>
> Signed-off-by: Ciara Loftus <ciara.loftus@xxxxxxxxx>
> ---
> .../qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 +
> .../caps_8.1.0_x86_64.xml | 1 +
> .../caps_8.2.0_x86_64.xml | 1 +
> .../hostdev-vfio-vf-token.x86_64-latest.args | 34 +++++++++++++++++++
> .../hostdev-vfio-vf-token.xml | 22 ++++++++++++
> tests/qemuxml2argvtest.c | 1 +
> 6 files changed, 60 insertions(+)
> create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-vf-token.x86_64-latest.args
> create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-vf-token.xml
>
> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
> index 427ee9d5c7..f4a65a133f 100644
> --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
> +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
> @@ -112,6 +112,7 @@
> <flag name='rbd-encryption-layering'/>
> <flag name='rbd-encryption-luks-any'/>
> <flag name='run-with.async-teardown'/>
> + <flag name='vf-token'/>
> <version>8000050</version>
> <microcodeVersion>39100245</microcodeVersion>
> <package>v8.0.0-1270-g1c12355b</package>
> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
> index d266dd0f31..202a2c7f8d 100644
> --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
> +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
> @@ -198,6 +198,7 @@
> <flag name='qcow2-discard-no-unref'/>
> <flag name='run-with.async-teardown'/>
> <flag name='virtio-blk-vhost-vdpa'/>
> + <flag name='vf-token'/>
> <version>8001000</version>
> <microcodeVersion>43100245</microcodeVersion>
> <package>v8.1.0</package>
> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
> index ef3bd14597..24809ab70f 100644
> --- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
> +++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
> @@ -199,6 +199,7 @@
> <flag name='qcow2-discard-no-unref'/>
> <flag name='run-with.async-teardown'/>
> <flag name='virtio-blk-vhost-vdpa'/>
> + <flag name='vf-token'/>
> <version>8001050</version>
> <microcodeVersion>43100246</microcodeVersion>
> <package>v8.1.0-3111-gad6ef0a42e</package>
As noted, these belong to 2/7, otherwise tests fail after that commit
...
> diff --git a/tests/qemuxml2argvdata/hostdev-vfio-vf-token.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-vfio-vf-token.x86_64-latest.args
> new file mode 100644
> index 0000000000..e449c84ea9
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/hostdev-vfio-vf-token.x86_64-latest.args
> @@ -0,0 +1,34 @@
> +LC_ALL=C \
> +PATH=/bin \
> +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
> +USER=test \
> +LOGNAME=test \
> +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
> +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
> +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
> +/usr/bin/qemu-system-x86_64 \
> +-name guest=QEMUGuest1,debug-threads=on \
> +-S \
> +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
> +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
> +-accel tcg \
> +-cpu qemu64 \
> +-m size=219136k \
> +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
> +-overcommit mem-lock=off \
> +-smp 1,sockets=1,cores=1,threads=1 \
> +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
> +-display none \
> +-no-user-config \
> +-nodefaults \
> +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
> +-mon chardev=charmonitor,id=monitor,mode=control \
> +-rtc base=utc \
> +-no-shutdown \
> +-boot strict=on \
> +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
> +-audiodev '{"id":"audio1","driver":"none"}' \
> +-device '{"driver":"vfio-pci","host":"0000:00:00.0","vf-token":"00112233-4455-6677-8899-aabbccddeeff","id":"hostdev0","bus":"pci.0","addr":"0x8"}' \
> +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
> +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
> +-msg timestamp=on
... and this MUST come after 6/7 otherwise testsuite fails on this
patch.
> diff --git a/tests/qemuxml2argvdata/hostdev-vfio-vf-token.xml b/tests/qemuxml2argvdata/hostdev-vfio-vf-token.xml
> new file mode 100644
> index 0000000000..87dddd762a
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/hostdev-vfio-vf-token.xml
> @@ -0,0 +1,22 @@
> +<domain type='qemu'>
> + <name>QEMUGuest1</name>
> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
> + <memory>219100</memory>
> + <os>
> + <type arch='x86_64' machine='pc'>hvm</type>
> + <boot dev='hd'/>
> + </os>
> + <devices>
> + <emulator>/usr/bin/qemu-system-x86_64</emulator>
> + <controller type='pci' index='0' model='pci-root'/>
> + <hostdev mode='subsystem' type='pci' managed='no'>
> + <driver name='vfio'/>
> + <source>
> + <address domain='0x0000' bus='0x00' slot='0x00' function='0x0'>
> + <vf-token uuid='00112233-4455-6677-8899-aabbccddeeff'/>
> + </address>
> + </source>
> + <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
> + </hostdev>
> + </devices>
> +</domain>
> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
> index b2ea2191dc..20bc914748 100644
> --- a/tests/qemuxml2argvtest.c
> +++ b/tests/qemuxml2argvtest.c
> @@ -1547,6 +1547,7 @@ mymain(void)
> DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-pci-duplicate");
> DO_TEST_CAPS_LATEST("hostdev-vfio");
> DO_TEST_CAPS_LATEST("hostdev-vfio-multidomain");
> + DO_TEST_CAPS_LATEST("hostdev-vfio-vf-token");
> DO_TEST_CAPS_LATEST("hostdev-mdev-precreated");
> DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-mdev-src-address-invalid");
> DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-mdev-invalid-target-address");
> --
> 2.25.1
> _______________________________________________
> Devel mailing list -- devel@xxxxxxxxxxxxxxxxx
> To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxx
_______________________________________________
Devel mailing list -- devel@xxxxxxxxxxxxxxxxx
To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxx
