Re: [libvirt] [PATCH v2] vz: support disabled items in vz boot order
On 06/30/2017 02:34 AM, Nikolay Shirokovskiy wrote:
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 | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
Is this a result of commit id '8c9252aa6' - if so, then it should be
stated... If not, what changed from the original commit '032c5bf98'
that added the check is now making it unnecessary should be added to the
commit message.
Reviewed-by: John Ferlan <jferlan(a)redhat.com>
I won't push yet though.
John
diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index 8ccd7ea..a6eb0dd 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -1736,11 +1736,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);