|
 |
ffd6ed |
From 99042dcb95d87ce6ac7e5cac9f437c543d6559af Mon Sep 17 00:00:00 2001
|
|
|
ffd6ed |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
ffd6ed |
Date: Wed, 9 Sep 2015 13:47:19 +0100
|
|
|
ffd6ed |
Subject: [PATCH] v2v: -o rhev, -o vdsm: Set DefaultDisplayType back to 1
|
|
|
ffd6ed |
(RHBZ#1260590).
|
|
|
ffd6ed |
|
|
|
ffd6ed |
In commit c4bc8116d9d586085f96da2e5558c9b366e84925, the DefaultDisplayType
|
|
|
ffd6ed |
was changed from 1 -> 2. However this is in fact wrong. See
|
|
|
ffd6ed |
https://bugzilla.redhat.com/show_bug.cgi?id=1260590#c17 for details.
|
|
|
ffd6ed |
|
|
|
ffd6ed |
This reverts the code back to what it was in
|
|
|
ffd6ed |
commit 829e3fe7a6ed834939a7a79e453ab873d3328ae1.
|
|
|
ffd6ed |
|
|
|
ffd6ed |
Thanks: Omer Frenkel
|
|
|
ffd6ed |
(cherry picked from commit e3aee9c14d093d010349567b2f035defceef57df)
|
|
|
ffd6ed |
---
|
|
|
ffd6ed |
v2v/OVF.ml | 7 ++-----
|
|
|
ffd6ed |
1 file changed, 2 insertions(+), 5 deletions(-)
|
|
|
ffd6ed |
|
|
|
ffd6ed |
diff --git a/v2v/OVF.ml b/v2v/OVF.ml
|
|
|
ffd6ed |
index 01f244a..9b387f2 100644
|
|
|
ffd6ed |
--- a/v2v/OVF.ml
|
|
|
ffd6ed |
+++ b/v2v/OVF.ml
|
|
|
ffd6ed |
@@ -275,11 +275,8 @@ let rec create_ovf verbose source targets guestcaps inspect
|
|
|
ffd6ed |
e "IsStateless" [] [PCData "False"];
|
|
|
ffd6ed |
e "Origin" [] [PCData "0"];
|
|
|
ffd6ed |
e "VmType" [] [PCData vmtype];
|
|
|
ffd6ed |
- (* The documentation for DefaultDisplayType is wrong. See
|
|
|
ffd6ed |
- * https://bugzilla.redhat.com/show_bug.cgi?id=1260590#c7 for
|
|
|
ffd6ed |
- * correct information.
|
|
|
ffd6ed |
- *)
|
|
|
ffd6ed |
- e "DefaultDisplayType" [] [PCData "2" (* qxl *)];
|
|
|
ffd6ed |
+ (* See https://bugzilla.redhat.com/show_bug.cgi?id=1260590#c17 *)
|
|
|
ffd6ed |
+ e "DefaultDisplayType" [] [PCData "1"];
|
|
|
ffd6ed |
|
|
|
ffd6ed |
e "Section" ["ovf:id", vm_uuid; "ovf:required", "false";
|
|
|
ffd6ed |
"xsi:type", "ovf:OperatingSystemSection_Type"] [
|
|
|
ffd6ed |
--
|
|
|
ffd6ed |
1.8.3.1
|
|
|
ffd6ed |
|