[Libguestfs] [PATCH 1/2] Revert "v2v: oVirt changed the ResourceType for QXL video devices (RHBZ#1598715)."

The change is not correct in case the OVF is used in -o vdsm mode, for example. Let's revert it, and then implement it properly. This reverts commit 296b2f66c71df0bf5ee2ee605fe4b92672796ab3. --- v2v/create_ovf.ml | 2 +- v2v/test-v2v-o-rhv.ovf.expected | 2 +- v2v/test-v2v-o-vdsm-options.ovf.expected | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml index 1cba165a4..901d47528 100644 --- a/v2v/create_ovf.ml +++ b/v2v/create_ovf.ml @@ -646,7 +646,7 @@ let rec create_ovf source targets guestcaps inspect e "Item" [] [ e "rasd:Caption" [] [PCData "Graphical Controller"]; e "rasd:InstanceId" [] [PCData (uuidgen ())]; - e "rasd:ResourceType" [] [PCData "32768"]; + e "rasd:ResourceType" [] [PCData "20"]; e "Type" [] [PCData "video"]; e "rasd:VirtualQuantity" [] [PCData "1"]; e "rasd:Device" [] [PCData "qxl"]; diff --git a/v2v/test-v2v-o-rhv.ovf.expected b/v2v/test-v2v-o-rhv.ovf.expected index 2f1032b1f..7bcc456c5 100644 --- a/v2v/test-v2v-o-rhv.ovf.expected +++ b/v2v/test-v2v-o-rhv.ovf.expected @@ -56,7 +56,7 @@ <Item> <rasd:Caption>Graphical Controller</rasd:Caption> <rasd:InstanceId>#UUID#</rasd:InstanceId> - <rasd:ResourceType>32768</rasd:ResourceType> + <rasd:ResourceType>20</rasd:ResourceType> <Type>video</Type> <rasd:VirtualQuantity>1</rasd:VirtualQuantity> <rasd:Device>qxl</rasd:Device> diff --git a/v2v/test-v2v-o-vdsm-options.ovf.expected b/v2v/test-v2v-o-vdsm-options.ovf.expected index abaf37e54..c1282c19b 100644 --- a/v2v/test-v2v-o-vdsm-options.ovf.expected +++ b/v2v/test-v2v-o-vdsm-options.ovf.expected @@ -56,7 +56,7 @@ <Item> <rasd:Caption>Graphical Controller</rasd:Caption> <rasd:InstanceId>#UUID#</rasd:InstanceId> - <rasd:ResourceType>32768</rasd:ResourceType> + <rasd:ResourceType>20</rasd:ResourceType> <Type>video</Type> <rasd:VirtualQuantity>1</rasd:VirtualQuantity> <rasd:Device>qxl</rasd:Device> -- 2.17.1