Shahar Havivi has uploaded a new change for review. Change subject: Engine: update video device save wrong values ......................................................................
Engine: update video device save wrong values Change-Id: I6cc48d5eb3fc60cba022d8f6b4a8dee3760be5e5 bug-url: https://bugzilla.redhat.com/787578 Signed-off-by: Shahar Havivi <shav...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java 1 file changed, 9 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/86/18786/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java index ca5df40..00a9dc6 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java @@ -64,7 +64,8 @@ } // if the console type has changed, recreate Video devices - if (oldVmBase.getDefaultDisplayType() != entity.getDefaultDisplayType()) { + if (oldVmBase.getDefaultDisplayType() != entity.getDefaultDisplayType() || (entity.getDefaultDisplayType() == DisplayType.qxl && oldVmBase.getNumOfMonitors() != entity + .getNumOfMonitors()) || oldVmBase.getSingleQxlPci() != entity.getSingleQxlPci()) { // delete all video device for (VmDevice device : dao.getVmDeviceByVmIdAndType(oldVmBase.getId(), VmDeviceGeneralType.VIDEO)) { dao.remove(device.getId()); @@ -80,10 +81,6 @@ false, null); } - } else if (entity.getDefaultDisplayType() == DisplayType.qxl && oldVmBase.getNumOfMonitors() != entity - .getNumOfMonitors()) { - // spice number of monitors has changed - updateNumOfMonitorsInVmDevice(oldVmBase, entity); } updateUSBSlots(oldVmBase, entity); updateMemoryBalloon(oldVmBase, entity, params.isBalloonEnabled()); @@ -831,8 +828,13 @@ */ private static Map<String, Object> getMemExpr(int numOfMonitors, boolean singleQxlPci) { int heads = singleQxlPci ? numOfMonitors : 1; - String mem = (numOfMonitors > 2 ? String.valueOf(VmDeviceCommonUtils.LOW_VIDEO_MEM * heads) : - String.valueOf(VmDeviceCommonUtils.HIGH_VIDEO_MEM * heads)); + String mem; + if (singleQxlPci) { + mem = String.valueOf(VmDeviceCommonUtils.LOW_VIDEO_MEM * heads); + } else { + mem = (numOfMonitors < 2 ? String.valueOf(VmDeviceCommonUtils.LOW_VIDEO_MEM) : + String.valueOf(VmDeviceCommonUtils.HIGH_VIDEO_MEM)); + } Map<String, Object> specParams = new HashMap<String, Object>(); specParams.put(VRAM, mem); specParams.put(HEADS, String.valueOf(heads)); -- To view, visit http://gerrit.ovirt.org/18786 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6cc48d5eb3fc60cba022d8f6b4a8dee3760be5e5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <shav...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
