[PATCH v3 2/6] qemu: tpm: Conditionally create storage on incoming migration

Stefan Berger stefanb at linux.ibm.com
Fri Oct 21 13:23:27 UTC 2022



On 10/21/22 06:55, Michal Prívozník wrote:
> On 10/18/22 19:04, Stefan Berger wrote:
>> Do not create storage if the TPM state files are on shared storage and
>> there's an incoming migration since in this case the storage directory
>> must already exist. Also do not run swtpm_setup in this case.
>>
>> Signed-off-by: Stefan Berger <stefanb at linux.ibm.com>
>> ---
>>   src/qemu/qemu_tpm.c | 10 +++++++++-
>>   1 file changed, 9 insertions(+), 1 deletion(-)
>>
>> diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c
>> index dc09c94a4d..a45ad599aa 100644
>> --- a/src/qemu/qemu_tpm.c
>> +++ b/src/qemu/qemu_tpm.c
>> @@ -556,11 +556,19 @@ qemuTPMEmulatorBuildCommand(virDomainTPMDef *tpm,
>>       int pwdfile_fd = -1;
>>       int migpwdfile_fd = -1;
>>       const unsigned char *secretuuid = NULL;
>> +    bool create_storage = true;
>>   
>>       if (!swtpm)
>>           return NULL;
>>   
>> -    if (qemuTPMEmulatorCreateStorage(tpm, &created, swtpm_user, swtpm_group) < 0)
>> +    /* Do not create storage and run swtpm_setup on incoming migration over
>> +     * shared storage
>> +     */
>> +    if (incomingMigration && virFileIsSharedFS(tpm->data.emulator.storagepath))
> 
> Here and everywhere else, this needs to be virFileIsSharedFS() == 1,
> because the function may return -1, 0, 1 and we do not want to treat -1
> as 1.

Thanks, I will fix it.

> 
>> +        create_storage = false;
>> +
>> +    if (create_storage &&
>> +        qemuTPMEmulatorCreateStorage(tpm, &created, swtpm_user, swtpm_group) < 0)
>>           return NULL;
>>   
>>       if (tpm->data.emulator.hassecretuuid)
> 
> Michal
> 

    Stefan



More information about the libvir-list mailing list