In preparation to moving the validation to the parser,
we need to supply the correct caps.
Signed-off-by: Ján Tomko <jtomko@xxxxxxxxxx>
---
...enc.xml => tpm-emulator-tpm2-enc.x86_64-latest.xml} | 4 ++--
...or-tpm2.xml => tpm-emulator-tpm2.x86_64-latest.xml} | 4 ++--
...tpm-emulator.xml => tpm-emulator.x86_64-latest.xml} | 4 ++--
...h-crb.xml => tpm-passthrough-crb.x86_64-latest.xml} | 4 ++--
...ssthrough.xml => tpm-passthrough.x86_64-latest.xml} | 4 ++--
tests/qemuxml2xmltest.c | 10 +++++-----
6 files changed, 15 insertions(+), 15 deletions(-)
rename tests/qemuxml2xmloutdata/{tpm-emulator-tpm2-enc.xml => tpm-emulator-tpm2-enc.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{tpm-emulator-tpm2.xml => tpm-emulator-tpm2.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{tpm-emulator.xml => tpm-emulator.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{tpm-passthrough-crb.xml => tpm-passthrough-crb.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{tpm-passthrough.xml => tpm-passthrough.x86_64-latest.xml} (89%)
diff --git a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.xml b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.xml
rename to tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.x86_64-latest.xml
index 8902725097..dcd504310f 100644
--- a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.xml
+++ b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.x86_64-latest.xml
@@ -18,7 +18,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
@@ -30,7 +30,7 @@
</backend>
</tpm>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2.xml b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/tpm-emulator-tpm2.xml
rename to tests/qemuxml2xmloutdata/tpm-emulator-tpm2.x86_64-latest.xml
index d30944c23d..625aaa5f60 100644
--- a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2.xml
+++ b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2.x86_64-latest.xml
@@ -18,7 +18,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
@@ -28,7 +28,7 @@
<backend type='emulator' version='2.0'/>
</tpm>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/tpm-emulator.xml b/tests/qemuxml2xmloutdata/tpm-emulator.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/tpm-emulator.xml
rename to tests/qemuxml2xmloutdata/tpm-emulator.x86_64-latest.xml
index ec33402499..002af76c21 100644
--- a/tests/qemuxml2xmloutdata/tpm-emulator.xml
+++ b/tests/qemuxml2xmloutdata/tpm-emulator.x86_64-latest.xml
@@ -18,7 +18,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
@@ -28,7 +28,7 @@
<backend type='emulator' version='1.2'/>
</tpm>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/tpm-passthrough-crb.xml b/tests/qemuxml2xmloutdata/tpm-passthrough-crb.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/tpm-passthrough-crb.xml
rename to tests/qemuxml2xmloutdata/tpm-passthrough-crb.x86_64-latest.xml
index 67ada46846..ef68c2d0d7 100644
--- a/tests/qemuxml2xmloutdata/tpm-passthrough-crb.xml
+++ b/tests/qemuxml2xmloutdata/tpm-passthrough-crb.x86_64-latest.xml
@@ -18,7 +18,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
@@ -30,7 +30,7 @@
</backend>
</tpm>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmloutdata/tpm-passthrough.xml b/tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/tpm-passthrough.xml
rename to tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml
index 8f9eca054d..2a99f35cf8 100644
--- a/tests/qemuxml2xmloutdata/tpm-passthrough.xml
+++ b/tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml
@@ -18,7 +18,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
@@ -30,7 +30,7 @@
</backend>
</tpm>
<memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index d7850a89d3..e4e426c99b 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -664,11 +664,11 @@ mymain(void)
DO_TEST("numad-auto-memory-vcpu-cpuset", NONE);
DO_TEST("usb-ich9-ehci-addr", NONE);
DO_TEST("disk-copy_on_read", NONE);
- DO_TEST("tpm-passthrough", NONE);
- DO_TEST("tpm-passthrough-crb", NONE);
- DO_TEST("tpm-emulator", NONE);
- DO_TEST("tpm-emulator-tpm2", NONE);
- DO_TEST("tpm-emulator-tpm2-enc", NONE);
+ DO_TEST_CAPS_LATEST("tpm-passthrough");
+ DO_TEST_CAPS_LATEST("tpm-passthrough-crb");
+ DO_TEST_CAPS_LATEST("tpm-emulator");
+ DO_TEST_CAPS_LATEST("tpm-emulator-tpm2");
+ DO_TEST_CAPS_LATEST("tpm-emulator-tpm2-enc");
DO_TEST("metadata", NONE);
DO_TEST("metadata-duplicate", NONE);
--
2.19.2
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
