]> xenbits.xensource.com Git - libvirt.git/commitdiff
vz: support disabled items in vz boot order
authorNikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Fri, 30 Jun 2017 06:34:27 +0000 (09:34 +0300)
committerJohn Ferlan <jferlan@redhat.com>
Wed, 23 Aug 2017 13:03:27 +0000 (09:03 -0400)
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.

src/vz/vz_sdk.c

index 52e18292df3f15c512e07c976052fe370cbd00ed..49b150473bf7aa47fb4057bf87a44d84ed343a94 100644 (file)
@@ -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);