From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Date: Fri, 30 Jun 2017 06:34:27 +0000 (+0300)
Subject: vz: support disabled items in vz boot order
X-Git-Tag: v3.7.0-rc1~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3cdbf22e3922d9f488b23ff0dcd55af95ac4f40;p=thirdparty%2Flibvirt.git

vz: support disabled items in vz boot order

At the time the check was written virtuozzo did not use disabled items in boot
order configuration. Boot items were always enabled. Now they can be disabled
as well. Supporting such items is easy - they just should be ignored.
---

diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index 52e18292df..49b150473b 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -1790,11 +1790,8 @@ prlsdkConvertBootOrderVm(PRL_HANDLE sdkdom, virDomainDefPtr def)
         pret = PrlBootDev_IsInUse(bootDev, &inUse);
         prlsdkCheckRetGoto(pret, cleanup);
 
-        if (!inUse) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("Boot ordering with disabled items is not supported"));
-            goto cleanup;
-        }
+        if (!inUse)
+            continue;
 
         pret = PrlBootDev_GetSequenceIndex(bootDev, &bootIndex);
         prlsdkCheckRetGoto(pret, cleanup);