On Tue, Jan 04, 2022 at 09:14:28 +0100, Michal Privoznik wrote: > Make the tpm-*.xml files symlinks to their respective input XMLs > from qemuxml2argvdata/ directory. This uncovers a bug in our > <tpm/> formatter which formats an invalid XML if both > <encryption/> and <active_pcr_banks/> elements are present for > <backend/>. This is going to be addressed in the next commit. > > Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx> > --- [...] > diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2.xml b/tests/qemuxml2argvdata/tpm-emulator-tpm2.xml > index 68db8b9232..59dd68311f 100644 > --- a/tests/qemuxml2argvdata/tpm-emulator-tpm2.xml > +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2.xml > @@ -12,24 +12,34 @@ > <features> > <acpi/> > </features> > + <cpu mode='custom' match='exact' check='none'> > + <model fallback='forbid'>qemu64</model> > + </cpu> > <clock offset='utc'/> > <on_poweroff>destroy</on_poweroff> > <on_reboot>restart</on_reboot> > <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'/> > <input type='mouse' bus='ps2'/> > <input type='keyboard' bus='ps2'/> > <tpm model='tpm-tis'> > <backend type='emulator' version='2.0'> > + <encryption secret='b4a117f1-8af2-44a4-91b8-7f0d2d4d68a3'/> > + > Summary of Failures: 253/315 libvirt / virschematest FAIL 1.47s exit status 1 > <active_pcr_banks> > <sha256/> > <sha512/> > </active_pcr_banks> > </backend> > </tpm> > - <memballoon model='virtio'/> > + <audio id='1' type='none'/> > + <memballoon model='virtio'> > + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> > + </memballoon> > </devices> > </domain>
