[PATCH 5/6] qemu: Rename qemuSecurityRestoreSavedStateLabel()

The function calls virSecurityManagerDomainRestorePathLabel() after all. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com&gt; --- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_security.c | 8 ++++---- src/qemu/qemu_security.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3fad440272..80648f1d32 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6953,7 +6953,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, 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); return ret; } diff --git a/src/qemu/qemu_security.c b/src/qemu/qemu_security.c index de4df23847..98f973ab12 100644 --- a/src/qemu/qemu_security.c +++ b/src/qemu/qemu_security.c @@ -615,9 +615,9 @@ qemuSecurityDomainSetPathLabel(virQEMUDriverPtr driver, int -qemuSecurityRestoreSavedStateLabel(virQEMUDriverPtr driver, - virDomainObjPtr vm, - const char *savefile) +qemuSecurityDomainRestorePathLabel(virQEMUDriverPtr driver, + virDomainObjPtr vm, + const char *path) { qemuDomainObjPrivatePtr priv = vm->privateData; pid_t pid = -1; @@ -631,7 +631,7 @@ qemuSecurityRestoreSavedStateLabel(virQEMUDriverPtr driver, if (virSecurityManagerDomainRestorePathLabel(driver->securityManager, vm->def, - savefile) < 0) + path) < 0) goto cleanup; if (virSecurityManagerTransactionCommit(driver->securityManager, diff --git a/src/qemu/qemu_security.h b/src/qemu/qemu_security.h index 4e701221cd..ed6b762662 100644 --- a/src/qemu/qemu_security.h +++ b/src/qemu/qemu_security.h @@ -101,9 +101,9 @@ int qemuSecurityDomainSetPathLabel(virQEMUDriverPtr driver, const char *path, bool allowSubtree); -int qemuSecurityRestoreSavedStateLabel(virQEMUDriverPtr driver, +int qemuSecurityDomainRestorePathLabel(virQEMUDriverPtr driver, virDomainObjPtr vm, - const char *savefile); + const char *path); int qemuSecurityCommandRun(virQEMUDriverPtr driver, virDomainObjPtr vm, -- 2.26.2