mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

v2v: change QXL ResourceType in OVirt flavour (RHBZ#1598715)

Browse Source 
Due to a conflict with the IDs of the OVF standard, and the existing
implementation in ovirt-engine, the ID of QXL devices changed to a
different value.

As a consequence, change the ResourceType of QXL devices, but only in
OVirt flavour to avoid breaking vdsm mode.

See: https://bugzilla.redhat.com/show_bug.cgi?id=1598715#c5
(cherry picked from commit aa9e18f6d1)
This commit is contained in:
Pino Toscano
2018-07-13 13:24:07 +02:00
parent e1401de974
commit 77604b91ec
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
v2v/create_ovf.ml
View File

@@ -643,10 +643,14 @@ let rec create_ovf source targets guestcaps inspect
* See RHBZ#1213701 and RHBZ#1211231 for the reasoning
* behind that.
*)
let qxl_resourcetype =
match ovf_flavour with
| OVirt -> 32768 (* RHBZ#1598715 *)
| RHVExportStorageDomain -> 20 in
e "Item" [] [
e "rasd:Caption" [] [PCData "Graphical Controller"];
e "rasd:InstanceId" [] [PCData (uuidgen ())];
e "rasd:ResourceType" [] [PCData "20"];
e "rasd:ResourceType" [] [PCData (string_of_int qxl_resourcetype)];
e "Type" [] [PCData "video"];
e "rasd:VirtualQuantity" [] [PCData "1"];
e "rasd:Device" [] [PCData "qxl"];