From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 14 Mar 2012 10:08:52 +0000 (+0100)
Subject: qemu: Reverse condition in qemuDomainCheckDiskPresence
X-Git-Tag: v0.9.11-rc1~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=823a27c628221c4c6cfb1d61beace263e0693832;p=thirdparty%2Flibvirt.git

qemu: Reverse condition in qemuDomainCheckDiskPresence

With current code, we pass true iff domain is cold booting. However,
if disk is inaccessible and startupPolicy for that disk is set to
'requisite' we have to fail iff cold booting.
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index f8b7c96532..625c59546f 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1703,7 +1703,7 @@ qemuDomainSetFakeReboot(struct qemud_driver *driver,
 int
 qemuDomainCheckDiskPresence(struct qemud_driver *driver,
                             virDomainObjPtr vm,
-                            bool start_with_state)
+                            bool cold_boot)
 {
     int ret = -1;
     int i;
@@ -1738,7 +1738,7 @@ qemuDomainCheckDiskPresence(struct qemud_driver *driver,
                 break;
 
             case VIR_DOMAIN_STARTUP_POLICY_REQUISITE:
-                if (!start_with_state) {
+                if (cold_boot) {
                     virReportSystemError(errno,
                                          _("cannot access file '%s'"),
                                          disk->src);