Hello Shmuel Melamud, I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/40920 to review the following change. Change subject: core: Incorrect check of VirtIO-SCSI status on VM update ...................................................................... core: Incorrect check of VirtIO-SCSI status on VM update If VirtIO-SCSI device is to be enabled on VM update, cluster and OS compatibility must be verified. If getParameters().isVirtioScsiEnabled() is null, that means the current device status must be preserved. In this case, cluster and OS compatibility must be verified, if VirtIO-SCSI device is currently enabled. This logic is correctly implemented in UpdateVmCommand.isVirtioScsiEnabled() method, so we use it instead of incorrect condition used previously. Change-Id: I459256da7df4ef0f6662479df2d6d0a6cabc001b Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1219697 Signed-off-by: Shmuel Melamud <smela...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/20/40920/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java index af0bcc4..2f15141 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java @@ -668,7 +668,7 @@ return failCanDoAction(VdcBllMessages.QOS_CPU_SHARES_OUT_OF_RANGE); } - if (Boolean.TRUE.equals(getParameters().isVirtioScsiEnabled()) || isVirtioScsiEnabledForVm(getVmId())) { + if (isVirtioScsiEnabled()) { // Verify cluster compatibility if (!FeatureSupported.virtIoScsi(getVdsGroup().getCompatibilityVersion())) { return failCanDoAction(VdcBllMessages.VIRTIO_SCSI_INTERFACE_IS_NOT_AVAILABLE_FOR_CLUSTER_LEVEL); -- To view, visit https://gerrit.ovirt.org/40920 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I459256da7df4ef0f6662479df2d6d0a6cabc001b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shmuel Leib Melamud <smela...@redhat.com> Gerrit-Reviewer: Shmuel Melamud <smela...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches