|
 |
e9bfca |
From 21e2f8ea59a87da9daee239cea26873b51ad2f79 Mon Sep 17 00:00:00 2001
|
|
|
e9bfca |
From: Pino Toscano <ptoscano@redhat.com>
|
|
|
e9bfca |
Date: Fri, 13 Jul 2018 13:24:07 +0200
|
|
|
e9bfca |
Subject: [PATCH] v2v: change QXL ResourceType in OVirt flavour (RHBZ#1598715)
|
|
|
e9bfca |
|
|
|
e9bfca |
Due to a conflict with the IDs of the OVF standard, and the existing
|
|
|
e9bfca |
implementation in ovirt-engine, the ID of QXL devices changed to a
|
|
|
e9bfca |
different value.
|
|
|
e9bfca |
|
|
|
e9bfca |
As a consequence, change the ResourceType of QXL devices, but only in
|
|
|
e9bfca |
OVirt flavour to avoid breaking vdsm mode.
|
|
|
e9bfca |
|
|
|
e9bfca |
See: https://bugzilla.redhat.com/show_bug.cgi?id=1598715#c5
|
|
|
e9bfca |
(cherry picked from commit aa9e18f6d1fd503822dfd2124b92a2c67704c4c1)
|
|
|
e9bfca |
---
|
|
|
e9bfca |
v2v/create_ovf.ml | 6 +++++-
|
|
|
e9bfca |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
e9bfca |
|
|
|
e9bfca |
diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml
|
|
|
e9bfca |
index 9e0c772fd..5db239d66 100644
|
|
|
e9bfca |
--- a/v2v/create_ovf.ml
|
|
|
e9bfca |
+++ b/v2v/create_ovf.ml
|
|
|
e9bfca |
@@ -643,10 +643,14 @@ let rec create_ovf source targets guestcaps inspect
|
|
|
e9bfca |
* See RHBZ#1213701 and RHBZ#1211231 for the reasoning
|
|
|
e9bfca |
* behind that.
|
|
|
e9bfca |
*)
|
|
|
e9bfca |
+ let qxl_resourcetype =
|
|
|
e9bfca |
+ match ovf_flavour with
|
|
|
e9bfca |
+ | OVirt -> 32768 (* RHBZ#1598715 *)
|
|
|
e9bfca |
+ | RHVExportStorageDomain -> 20 in
|
|
|
e9bfca |
e "Item" [] [
|
|
|
e9bfca |
e "rasd:Caption" [] [PCData "Graphical Controller"];
|
|
|
e9bfca |
e "rasd:InstanceId" [] [PCData (uuidgen ())];
|
|
|
e9bfca |
- e "rasd:ResourceType" [] [PCData "20"];
|
|
|
e9bfca |
+ e "rasd:ResourceType" [] [PCData (string_of_int qxl_resourcetype)];
|
|
|
e9bfca |
e "Type" [] [PCData "video"];
|
|
|
e9bfca |
e "rasd:VirtualQuantity" [] [PCData "1"];
|
|
|
e9bfca |
e "rasd:Device" [] [PCData "qxl"];
|
|
|
e9bfca |
--
|
|
|
8ff76f |
2.20.1
|
|
|
e9bfca |
|