From e2705cfb6e50039a5f1d1c620f7ed18b37eca36d Mon Sep 17 00:00:00 2001 From: Martin Kletzander Date: Mon, 1 Aug 2016 17:52:02 +0200 Subject: [PATCH] qemu: Make qemuDomainCheckDiskStartupPolicy self-contained There is an error reset following the function and check for startupPolicy before that. Let's reflect those things inside that function so that future code doesn't have to be that complex. Signed-off-by: Martin Kletzander --- src/qemu/qemu_domain.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 0a3cf0e9c3..5dc521f6e4 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4192,6 +4192,7 @@ qemuDomainCheckDiskStartupPolicy(virQEMUDriverPtr driver, return -1; break; + case VIR_DOMAIN_STARTUP_POLICY_DEFAULT: case VIR_DOMAIN_STARTUP_POLICY_MANDATORY: return -1; @@ -4200,14 +4201,13 @@ qemuDomainCheckDiskStartupPolicy(virQEMUDriverPtr driver, return -1; break; - case VIR_DOMAIN_STARTUP_POLICY_DEFAULT: case VIR_DOMAIN_STARTUP_POLICY_LAST: /* this should never happen */ break; } qemuDomainCheckRemoveOptionalDisk(driver, vm, diskIndex); - + virResetLastError(); return 0; } @@ -4241,12 +4241,8 @@ qemuDomainCheckDiskPresence(virQEMUDriverPtr driver, if (qemuDomainDetermineDiskChain(driver, vm, disk, true, true) >= 0) continue; - if (disk->startupPolicy && - qemuDomainCheckDiskStartupPolicy(driver, vm, idx, - cold_boot) >= 0) { - virResetLastError(); + if (qemuDomainCheckDiskStartupPolicy(driver, vm, idx, cold_boot) >= 0) continue; - } goto error; } -- GitLab