[PATCH 2/4] qemuxml2xmloutdata: Turn tpm-*.xml files into symlinks
Michal Prívozník
mprivozn at redhat.com
Tue Jan 4 08:31:39 UTC 2022
On 1/4/22 09:30, Peter Krempa wrote:
> 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 at redhat.com>
>> ---
>
> [...]
>
>> 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
To cite from the cover letter:
Please note that the test suite is temporarily broken after 2/4 but
fixed in 3/4. This could be resolved be swapping those two patches, but
I figured I keep the order to demonstrate the bug. However, I can do the
swap if desired.
Michal
More information about the libvir-list
mailing list