Re: [libvirt] [PATCH 02/12] tests: Remove 'kvm' PCI backend from domaincapstest

The KVM assignment was removed in qemu driver in previous commit. Remove it from domaincapstest too which is hard coding it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com&gt; --- tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml | 1 - tests/domaincapsschemadata/qemu_2.12.0-virt.aarch64.xml | 1 - tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml | 1 - tests/domaincapsschemadata/qemu_2.12.0.s390x.xml | 1 - tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml | 1 - tests/domaincapsschemadata/qemu_2.6.0-virt.aarch64.xml | 1 - tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml | 1 - tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml | 1 - tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml | 1 - tests/domaincapsschemadata/qemu_2.7.0.s390x.xml | 1 - tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml | 1 - tests/domaincapsschemadata/qemu_2.8.0.s390x.xml | 1 - tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml | 1 - tests/domaincapsschemadata/qemu_2.9.0-q35.x86_64.xml | 1 - tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml | 1 - tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml | 1 - tests/domaincapsschemadata/qemu_3.0.0.s390x.xml | 1 - tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml | 1 - tests/domaincapsschemadata/qemu_4.0.0.s390x.xml | 1 - tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml | 1 - tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml | 1 - tests/domaincapstest.c | 1 - 22 files changed, 22 deletions(-)

diff --git a/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml b/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml index f14f245007..a2df336833 100644 --- a/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml @@ -112,7 +112,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.12.0-virt.aarch64.xml b/tests/domaincapsschemadata/qemu_2.12.0-virt.aarch64.xml index cc65977f03..ed1af3224b 100644 --- a/tests/domaincapsschemadata/qemu_2.12.0-virt.aarch64.xml +++ b/tests/domaincapsschemadata/qemu_2.12.0-virt.aarch64.xml @@ -116,7 +116,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml b/tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml index 8c490fa4d1..99de2b0a8e 100644 --- a/tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml +++ b/tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml @@ -80,7 +80,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml b/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml index 18171f0db4..8d039f3514 100644 --- a/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml +++ b/tests/domaincapsschemadata/qemu_2.12.0.s390x.xml @@ -172,7 +172,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml b/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml index 146041a6c1..109162ffd8 100644 --- a/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml @@ -145,7 +145,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.6.0-virt.aarch64.xml b/tests/domaincapsschemadata/qemu_2.6.0-virt.aarch64.xml index 778e27582f..13441b9923 100644 --- a/tests/domaincapsschemadata/qemu_2.6.0-virt.aarch64.xml +++ b/tests/domaincapsschemadata/qemu_2.6.0-virt.aarch64.xml @@ -113,7 +113,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml b/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml index a01f5ef72f..974739c38e 100644 --- a/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml +++ b/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml @@ -111,7 +111,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml b/tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml index a74cece8b6..9f628a3652 100644 --- a/tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml +++ b/tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml @@ -84,7 +84,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml b/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml index 949c5f8723..bb1f784328 100644 --- a/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml @@ -119,7 +119,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.7.0.s390x.xml b/tests/domaincapsschemadata/qemu_2.7.0.s390x.xml index 8c66d6582a..322d12c719 100644 --- a/tests/domaincapsschemadata/qemu_2.7.0.s390x.xml +++ b/tests/domaincapsschemadata/qemu_2.7.0.s390x.xml @@ -77,7 +77,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml b/tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml index 6fa74e29b0..b6679a6e64 100644 --- a/tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml @@ -120,7 +120,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml b/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml index d27977242a..c7a4578f61 100644 --- a/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml +++ b/tests/domaincapsschemadata/qemu_2.8.0.s390x.xml @@ -158,7 +158,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml b/tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml index b39aecb52b..3af3fcc4a9 100644 --- a/tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml @@ -120,7 +120,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.9.0-q35.x86_64.xml b/tests/domaincapsschemadata/qemu_2.9.0-q35.x86_64.xml index 66b4a84c3f..aac295a20d 100644 --- a/tests/domaincapsschemadata/qemu_2.9.0-q35.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_2.9.0-q35.x86_64.xml @@ -129,7 +129,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml b/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml index e41571e11a..12537c039b 100644 --- a/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml @@ -152,7 +152,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml b/tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml index f9a8c490aa..80fc7e1657 100644 --- a/tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml @@ -129,7 +129,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_3.0.0.s390x.xml b/tests/domaincapsschemadata/qemu_3.0.0.s390x.xml index 6dd5da07a5..0e81e2ea33 100644 --- a/tests/domaincapsschemadata/qemu_3.0.0.s390x.xml +++ b/tests/domaincapsschemadata/qemu_3.0.0.s390x.xml @@ -178,7 +178,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml b/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml index 1958eb9beb..402848442f 100644 --- a/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml @@ -147,7 +147,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_4.0.0.s390x.xml b/tests/domaincapsschemadata/qemu_4.0.0.s390x.xml index 30062a2b23..e68f8e8d9a 100644 --- a/tests/domaincapsschemadata/qemu_4.0.0.s390x.xml +++ b/tests/domaincapsschemadata/qemu_4.0.0.s390x.xml @@ -184,7 +184,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml b/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml index 8c6a622afe..1ffd5e3cc0 100644 --- a/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml @@ -147,7 +147,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml b/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml index 80ce931fbf..79b41ef6da 100644 --- a/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml @@ -151,7 +151,6 @@ <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> - <value>kvm</value> <value>vfio</value> </enum> </hostdev> diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 77acefa6b0..dc50b326f3 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -117,7 +117,6 @@ fillQemuCaps(virDomainCapsPtr domCaps, * instead of mocking set the expected values here by hand. */ VIR_DOMAIN_CAPS_ENUM_SET(domCaps->hostdev.pciBackend, VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT, - VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM, VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO); /* As of f05b6a918e28 we are expecting to see OVMF_CODE.fd file which