Shahar Havivi has uploaded a new change for review. Change subject: engine: set multi monitor only when compatible on import ......................................................................
engine: set multi monitor only when compatible on import Change-Id: I8a5ae4a6367fd5e4184f42b514f9be6e42879c26 Bug-Url: https://bugzilla.redhat.com/1007784 Signed-off-by: Shahar Havivi <[email protected]> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/73/19473/1 diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java index 03c6191..13afa71 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java @@ -7,6 +7,7 @@ import java.util.Map; import org.apache.commons.lang.StringUtils; +import org.ovirt.engine.core.common.FeatureSupported; import org.ovirt.engine.core.common.businessentities.BootSequence; import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.DiskInterface; @@ -29,6 +30,7 @@ import org.ovirt.engine.core.compat.backendcompat.XmlNamespaceManager; import org.ovirt.engine.core.compat.backendcompat.XmlNode; import org.ovirt.engine.core.compat.backendcompat.XmlNodeList; +import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.core.utils.customprop.DevicePropertiesUtils; import org.ovirt.engine.core.utils.linq.LinqUtils; import org.ovirt.engine.core.utils.linq.Predicate; @@ -390,7 +392,8 @@ if ("ovf:OperatingSystemSection_Type".equals(value)) { readOsSection(section); - if (!OsRepositoryImpl.INSTANCE.isLinux(vmBase.getOsId())) { + if (!OsRepositoryImpl.INSTANCE.isLinux(vmBase.getOsId()) || + !FeatureSupported.singleQxlPci(new Version(getVersion()))) { vmBase.setSingleQxlPci(false); } } -- To view, visit http://gerrit.ovirt.org/19473 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a5ae4a6367fd5e4184f42b514f9be6e42879c26 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
