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

qemu: domain: Sanitize return value handling in disk presence checker

Browse Source 
One of the functions is returning always 0 and the second one uses
unnecessary labels.
This commit is contained in:
Peter Krempa 2016-06-02 15:20:40 +02:00
parent f392654b5e
commit 1e467f6622
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_domain.c
View File

@ -3943,7 +3943,7 @@ qemuDomainSetFakeReboot(virQEMUDriverPtr driver,
virObjectUnref(cfg); virObjectUnref(cfg);
} }
static int static void
qemuDomainCheckRemoveOptionalDisk(virQEMUDriverPtr driver, qemuDomainCheckRemoveOptionalDisk(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
size_t diskIndex) size_t diskIndex)
@ -3975,8 +3975,6 @@ qemuDomainCheckRemoveOptionalDisk(virQEMUDriverPtr driver,
} }
qemuDomainEventQueue(driver, event); qemuDomainEventQueue(driver, event);
return 0;
} }
static int static int
@ -3996,15 +3994,15 @@ qemuDomainCheckDiskStartupPolicy(virQEMUDriverPtr driver,
if (!cold_boot && if (!cold_boot &&
device != VIR_DOMAIN_DISK_DEVICE_FLOPPY && device != VIR_DOMAIN_DISK_DEVICE_FLOPPY &&
device != VIR_DOMAIN_DISK_DEVICE_CDROM) device != VIR_DOMAIN_DISK_DEVICE_CDROM)
goto error; return -1;
break; break;
case VIR_DOMAIN_STARTUP_POLICY_MANDATORY: case VIR_DOMAIN_STARTUP_POLICY_MANDATORY:
goto error; return -1;
case VIR_DOMAIN_STARTUP_POLICY_REQUISITE: case VIR_DOMAIN_STARTUP_POLICY_REQUISITE:
if (cold_boot) if (cold_boot)
goto error; return -1;
break; break;
case VIR_DOMAIN_STARTUP_POLICY_DEFAULT: case VIR_DOMAIN_STARTUP_POLICY_DEFAULT:
@ -4013,13 +4011,9 @@ qemuDomainCheckDiskStartupPolicy(virQEMUDriverPtr driver,
break; break;
} }
if (qemuDomainCheckRemoveOptionalDisk(driver, vm, diskIndex) < 0) qemuDomainCheckRemoveOptionalDisk(driver, vm, diskIndex);
goto error;
return 0; return 0;
error:
return -1;
} }