External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-03 02:15:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Don't check for qemuDomainManagedSavePath() retval

Browse Source 
The qemuDomainManagedSavePath() function does no more than a
g_strdup_printf() and as such can't return NULL really.
Therefore, don't check for its return value.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Michal Privoznik 2022-05-12 13:32:49 +02:00
parent dc2b2b3ab9
commit 56ab5c3ae9
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/qemu/qemu_driver.c
View File

@ -2904,8 +2904,7 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int flags)
"save", false)) < 0) "save", false)) < 0)
goto cleanup; goto cleanup;
if (!(name = qemuDomainManagedSavePath(driver, vm))) name = qemuDomainManagedSavePath(driver, vm);
goto cleanup;
VIR_INFO("Saving state of domain '%s' to '%s'", vm->def->name, name); VIR_INFO("Saving state of domain '%s' to '%s'", vm->def->name, name);
@ -2926,19 +2925,15 @@ qemuDomainManagedSaveLoad(virDomainObj *vm,
{ {
virQEMUDriver *driver = opaque; virQEMUDriver *driver = opaque;
g_autofree char *name = NULL; g_autofree char *name = NULL;
int ret = -1;
virObjectLock(vm); virObjectLock(vm);
if (!(name = qemuDomainManagedSavePath(driver, vm))) name = qemuDomainManagedSavePath(driver, vm);
goto cleanup;
vm->hasManagedSave = virFileExists(name); vm->hasManagedSave = virFileExists(name);
ret = 0;
cleanup:
virObjectUnlock(vm); virObjectUnlock(vm);
return ret; return 0;
} }
@ -2979,8 +2974,7 @@ qemuDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags)
if (virDomainManagedSaveRemoveEnsureACL(dom->conn, vm->def) < 0) if (virDomainManagedSaveRemoveEnsureACL(dom->conn, vm->def) < 0)
goto cleanup; goto cleanup;
if (!(name = qemuDomainManagedSavePath(driver, vm))) name = qemuDomainManagedSavePath(driver, vm);
goto cleanup;
if (unlink(name) < 0) { if (unlink(name) < 0) {
virReportSystemError(errno, virReportSystemError(errno,
@ -6079,8 +6073,7 @@ qemuDomainManagedSaveGetXMLDesc(virDomainPtr dom, unsigned int flags)
if (virDomainManagedSaveGetXMLDescEnsureACL(dom->conn, vm->def, flags) < 0) if (virDomainManagedSaveGetXMLDescEnsureACL(dom->conn, vm->def, flags) < 0)
goto cleanup; goto cleanup;
if (!(path = qemuDomainManagedSavePath(driver, vm))) path = qemuDomainManagedSavePath(driver, vm);
goto cleanup;
if (!virFileExists(path)) { if (!virFileExists(path)) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s", virReportError(VIR_ERR_OPERATION_INVALID, "%s",
@ -6117,8 +6110,7 @@ qemuDomainManagedSaveDefineXML(virDomainPtr dom, const char *dxml,
if (virDomainManagedSaveDefineXMLEnsureACL(conn, vm->def) < 0) if (virDomainManagedSaveDefineXMLEnsureACL(conn, vm->def) < 0)
goto cleanup; goto cleanup;
if (!(path = qemuDomainManagedSavePath(driver, vm))) path = qemuDomainManagedSavePath(driver, vm);
goto cleanup;
if (!virFileExists(path)) { if (!virFileExists(path)) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s", virReportError(VIR_ERR_OPERATION_INVALID, "%s",
@ -6427,9 +6419,6 @@ qemuDomainObjStart(virConnectPtr conn,
*/ */
managed_save = qemuDomainManagedSavePath(driver, vm); managed_save = qemuDomainManagedSavePath(driver, vm);
if (!managed_save)
return ret;
if (virFileExists(managed_save)) { if (virFileExists(managed_save)) {
if (force_boot) { if (force_boot) {
if (unlink(managed_save) < 0) { if (unlink(managed_save) < 0) {
@ -6690,8 +6679,6 @@ qemuDomainUndefineFlags(virDomainPtr dom,
} }
name = qemuDomainManagedSavePath(driver, vm); name = qemuDomainManagedSavePath(driver, vm);
if (name == NULL)
goto endjob;
if (virFileExists(name)) { if (virFileExists(name)) {
if (flags & VIR_DOMAIN_UNDEFINE_MANAGED_SAVE) { if (flags & VIR_DOMAIN_UNDEFINE_MANAGED_SAVE) {