External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-10 23:07:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Rename qemuSecurityRestoreSavedStateLabel()

Browse Source 
The function calls virSecurityManagerDomainRestorePathLabel()
after all.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Michal Privoznik 2020-06-17 12:40:28 +02:00
parent 4ccbd207f2
commit 6a0eaebaaf
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_driver.c
View File

@ -6958,7 +6958,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED,
asyncJob, VIR_QEMU_PROCESS_STOP_MIGRATED); asyncJob, VIR_QEMU_PROCESS_STOP_MIGRATED);
} }
if (qemuSecurityRestoreSavedStateLabel(driver, vm, path) < 0) if (qemuSecurityDomainRestorePathLabel(driver, vm, path) < 0)
VIR_WARN("failed to restore save state label on %s", path); VIR_WARN("failed to restore save state label on %s", path);
return ret; return ret;
} }

8
src/qemu/qemu_security.c
View File

@ -615,9 +615,9 @@ qemuSecurityDomainSetPathLabel(virQEMUDriverPtr driver,
int int
qemuSecurityRestoreSavedStateLabel(virQEMUDriverPtr driver, qemuSecurityDomainRestorePathLabel(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
const char *savefile) const char *path)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
pid_t pid = -1; pid_t pid = -1;
@ -631,7 +631,7 @@ qemuSecurityRestoreSavedStateLabel(virQEMUDriverPtr driver,
if (virSecurityManagerDomainRestorePathLabel(driver->securityManager, if (virSecurityManagerDomainRestorePathLabel(driver->securityManager,
vm->def, vm->def,
savefile) < 0) path) < 0)
goto cleanup; goto cleanup;
if (virSecurityManagerTransactionCommit(driver->securityManager, if (virSecurityManagerTransactionCommit(driver->securityManager,

4
src/qemu/qemu_security.h
View File

@ -101,9 +101,9 @@ int qemuSecurityDomainSetPathLabel(virQEMUDriverPtr driver,
const char *path, const char *path,
bool allowSubtree); bool allowSubtree);
int qemuSecurityRestoreSavedStateLabel(virQEMUDriverPtr driver, int qemuSecurityDomainRestorePathLabel(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
const char *savefile); const char *path);
int qemuSecurityCommandRun(virQEMUDriverPtr driver, int qemuSecurityCommandRun(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,