100 lines
3.8 KiB
Diff
100 lines
3.8 KiB
Diff
From 47a7121267a900c132b2cdf7024cfc99e8e46c70 Mon Sep 17 00:00:00 2001
|
|
From: Laszlo Ersek <lersek@redhat.com>
|
|
Date: Sat, 13 Nov 2021 22:49:43 +0100
|
|
Subject: [PATCH] lib/create_ovf: place a standard VGA video device in the OVF
|
|
xml
|
|
|
|
As of ovirt-engine commit daca2ca6cd91, ovirt-engine ignores
|
|
|
|
<rasd:Device>qxl</rasd:Device>
|
|
|
|
entirely. That's mainly because
|
|
|
|
- the "rasd" namespace prefix selects the
|
|
"http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
|
|
namespace, and
|
|
|
|
- that namespace does not define a Device element.
|
|
|
|
Consequently, ovirt-engine picks the QXL device based on factors that are
|
|
unrelated to <rasd:Device>qxl</rasd:Device>, even now.
|
|
|
|
However, ovirt-engine does adhere to the plain <Device> element. Change
|
|
the element from <rasd:Device> to <Device>, and change its contents from
|
|
"qxl" to "vga", which ovirt-engine also recognizes already.
|
|
|
|
References:
|
|
- https://listman.redhat.com/archives/libguestfs/2021-November/msg00149.html
|
|
- https://bugzilla.redhat.com/show_bug.cgi?id=1976607#c3
|
|
- https://bugzilla.redhat.com/show_bug.cgi?id=1976607#c4
|
|
- https://listman.redhat.com/archives/libguestfs/2021-November/msg00218.html
|
|
|
|
Cc: Arik Hadas <ahadas@redhat.com>
|
|
Cc: Liran Rotenberg <lrotenbe@redhat.com>
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1961107
|
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
---
|
|
lib/create_ovf.ml | 11 +++++++----
|
|
tests/test-v2v-o-rhv.ovf.expected | 2 +-
|
|
tests/test-v2v-o-vdsm-options.ovf.expected | 2 +-
|
|
3 files changed, 9 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/lib/create_ovf.ml b/lib/create_ovf.ml
|
|
index 8c8ef43a42cd..698a804fb394 100644
|
|
--- a/lib/create_ovf.ml
|
|
+++ b/lib/create_ovf.ml
|
|
@@ -675,9 +675,12 @@ let rec create_ovf source inspect
|
|
e "rasd:UsbPolicy" [] [PCData "Disabled"];
|
|
];
|
|
|
|
- (* We always add a qxl device when outputting to RHV.
|
|
- * See RHBZ#1213701 and RHBZ#1211231 for the reasoning
|
|
- * behind that.
|
|
+ (* We always add a standard VGA-compatible video controller when
|
|
+ * outputting to RHV. See RHBZ#1213701 and RHBZ#1211231 for the
|
|
+ * reasoning behind that. The device model used to be QXL previously,
|
|
+ * but only the unaccelerated standard VGA framebuffer is needed; so
|
|
+ * the (simpler) standard VGA device itself suffices. Refer to
|
|
+ * RHBZ#1961107.
|
|
*)
|
|
let monitor_resourcetype =
|
|
match ovf_flavour with
|
|
@@ -690,7 +693,7 @@ let rec create_ovf source inspect
|
|
[PCData (string_of_int monitor_resourcetype)];
|
|
e "Type" [] [PCData "video"];
|
|
e "rasd:VirtualQuantity" [] [PCData "1"];
|
|
- e "rasd:Device" [] [PCData "qxl"];
|
|
+ e "Device" [] [PCData "vga"];
|
|
]
|
|
];
|
|
|
|
diff --git a/tests/test-v2v-o-rhv.ovf.expected b/tests/test-v2v-o-rhv.ovf.expected
|
|
index f8aa07c45d4c..795c48f878d4 100644
|
|
--- a/tests/test-v2v-o-rhv.ovf.expected
|
|
+++ b/tests/test-v2v-o-rhv.ovf.expected
|
|
@@ -60,7 +60,7 @@
|
|
<rasd:ResourceType>20</rasd:ResourceType>
|
|
<Type>video</Type>
|
|
<rasd:VirtualQuantity>1</rasd:VirtualQuantity>
|
|
- <rasd:Device>qxl</rasd:Device>
|
|
+ <Device>vga</Device>
|
|
</Item>
|
|
<Item>
|
|
<rasd:Caption>RNG Device</rasd:Caption>
|
|
diff --git a/tests/test-v2v-o-vdsm-options.ovf.expected b/tests/test-v2v-o-vdsm-options.ovf.expected
|
|
index f861071c08c3..ddeb5b1cf50f 100644
|
|
--- a/tests/test-v2v-o-vdsm-options.ovf.expected
|
|
+++ b/tests/test-v2v-o-vdsm-options.ovf.expected
|
|
@@ -60,7 +60,7 @@
|
|
<rasd:ResourceType>32768</rasd:ResourceType>
|
|
<Type>video</Type>
|
|
<rasd:VirtualQuantity>1</rasd:VirtualQuantity>
|
|
- <rasd:Device>qxl</rasd:Device>
|
|
+ <Device>vga</Device>
|
|
</Item>
|
|
<Item>
|
|
<rasd:Caption>RNG Device</rasd:Caption>
|
|
--
|
|
2.19.1.3.g30247aa5d201
|
|
|