v2v: -o rhev, -o vdsm: Set DefaultDisplayType back to 1 (RHBZ#1260590).

In commit c4bc8116d9, the DefaultDisplayType
was changed from 1 -> 2.  However this is in fact wrong.  See
https://bugzilla.redhat.com/show_bug.cgi?id=1260590#c17 for details.

This reverts the code back to what it was in
commit 829e3fe7a6.

Thanks: Omer Frenkel
This commit is contained in:
Richard W.M. Jones
2015-09-09 13:47:19 +01:00
parent d68be534ea
commit e3aee9c14d

View File

@@ -282,11 +282,8 @@ let rec create_ovf source targets guestcaps inspect
e "IsStateless" [] [PCData "False"];
e "Origin" [] [PCData (string_of_int origin)];
e "VmType" [] [PCData vmtype];
(* The documentation for DefaultDisplayType is wrong. See
* https://bugzilla.redhat.com/show_bug.cgi?id=1260590#c7 for
* correct information.
*)
e "DefaultDisplayType" [] [PCData "2" (* qxl *)];
(* See https://bugzilla.redhat.com/show_bug.cgi?id=1260590#c17 *)
e "DefaultDisplayType" [] [PCData "1"];
e "Section" ["ovf:id", vm_uuid; "ovf:required", "false";
"xsi:type", "ovf:OperatingSystemSection_Type"] [