Tomas Jelinek has uploaded a new change for review. Change subject: core: SPICE copyPaste/fileTransfer not passed properly ......................................................................
core: SPICE copyPaste/fileTransfer not passed properly The problem was that the VmInfoBuilderBase checked if the SPICE device is there according to the graphicsInfo. The problem was that the graphicsInfo is a dynamic attribute containing things like IP, port etc which exists only after the VM has been created - here we are just creating it so it does not yet exist. Changed to check the device instead. Change-Id: Ic09709b579fd3e2fe622790f66286537ad01e728 Bug-Url: https://bugzilla.redhat.com/983019 Signed-off-by: Tomas Jelinek <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/38/42038/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java index f527bc3..2129bc8 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java @@ -29,6 +29,7 @@ import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.osinfo.OsRepository; import org.ovirt.engine.core.common.utils.SimpleDependecyInjector; +import org.ovirt.engine.core.common.utils.VmDeviceType; import org.ovirt.engine.core.common.utils.customprop.VmPropertiesUtils; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.WindowsJavaTimezoneMapping; @@ -148,7 +149,13 @@ createInfo.put(VdsProperties.transparent_huge_pages, vm.isTransparentHugePages() ? "true" : "false"); - if (vm.getGraphicsInfos().containsKey(GraphicsType.SPICE)) { + List<VmDevice> spiceDevs = DbFacade.getInstance().getVmDeviceDao().getVmDeviceByVmIdTypeAndDevice( + vm.getId(), + VmDeviceGeneralType.GRAPHICS, + VmDeviceType.SPICE.getName() + ); + + if (!spiceDevs.isEmpty()) { createInfo.put(VdsProperties.spiceFileTransferEnable, Boolean.toString(vm.isSpiceFileTransferEnabled())); createInfo.put(VdsProperties.spiceCopyPasteEnable, -- To view, visit https://gerrit.ovirt.org/42038 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic09709b579fd3e2fe622790f66286537ad01e728 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
