shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-24 22:50:26 +03:00
Code Releases Activity

qemu_security: Rework qemuSecurityCleanupTPMEmulator()

Browse Source 
Currently, qemuSecurityCleanupTPMEmulator() returns nothing which
means a caller (well, there's only one - qemuExtTPMStop()) can't
produce a warning when restoring seclabels on TPM state failed.
True, qemuSecurityCleanupTPMEmulator() does report a warning
itself, but only in one specific error path.

Make the function return an integer, just like the rest of
qemuSecurity*Restore() functions.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Michal Privoznik 2022-12-14 14:53:10 +01:00
parent 24cc9cda82
commit 8d6e1f3764
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/qemu/qemu_security.c
View File

@ -576,26 +576,29 @@ qemuSecurityStartTPMEmulator(virQEMUDriver *driver,
}
void
int
qemuSecurityCleanupTPMEmulator(virQEMUDriver *driver,
virDomainObj *vm,
bool restoreTPMStateLabel)
{
qemuDomainObjPrivate *priv = vm->privateData;
bool transactionStarted = false;
int ret = -1;
if (virSecurityManagerTransactionStart(driver->securityManager) >= 0)
transactionStarted = true;
if (virSecurityManagerTransactionStart(driver->securityManager) < 0)
goto cleanup;
virSecurityManagerRestoreTPMLabels(driver->securityManager,
vm->def, restoreTPMStateLabel);
if (virSecurityManagerRestoreTPMLabels(driver->securityManager,
vm->def, restoreTPMStateLabel) < 0)
goto cleanup;
if (transactionStarted &&
virSecurityManagerTransactionCommit(driver->securityManager,
if (virSecurityManagerTransactionCommit(driver->securityManager,
-1, priv->rememberOwner) < 0)
VIR_WARN("Unable to run security manager transaction");
goto cleanup;
ret = 0;
cleanup:
virSecurityManagerTransactionAbort(driver->securityManager);
return ret;
}

6
src/qemu/qemu_security.h
View File

@ -94,9 +94,9 @@ int qemuSecurityStartTPMEmulator(virQEMUDriver *driver,
int *exitstatus,
int *cmdret);
void qemuSecurityCleanupTPMEmulator(virQEMUDriver *driver,
virDomainObj *vm,
bool restoreTPMStateLabel);
int qemuSecurityCleanupTPMEmulator(virQEMUDriver *driver,
virDomainObj *vm,
bool restoreTPMStateLabel);
int qemuSecuritySetSavedStateLabel(virQEMUDriver *driver,
virDomainObj *vm,

3
src/qemu/qemu_tpm.c
View File

@ -1143,7 +1143,8 @@ qemuExtTPMStop(virQEMUDriver *driver,
if (outgoingMigration || qemuTPMHasSharedStorage(vm->def))
restoreTPMStateLabel = false;
qemuSecurityCleanupTPMEmulator(driver, vm, restoreTPMStateLabel);
if (qemuSecurityCleanupTPMEmulator(driver, vm, restoreTPMStateLabel) < 0)
VIR_WARN("Unable to restore labels on TPM state and/or log file");
}