54 lines
2.1 KiB
Diff
54 lines
2.1 KiB
Diff
From 06398e53b2d642f54d73f6e0a1262d71afbb2ad4 Mon Sep 17 00:00:00 2001
|
|
From: Laszlo Ersek <lersek@redhat.com>
|
|
Date: Sat, 13 Nov 2021 22:35:18 +0100
|
|
Subject: [PATCH] lib/create_ovf: fix "qxl_resourcetype" misnomer
|
|
|
|
The OVF resource types 32768 and 20 have nothing to do with QXL (or with
|
|
any other video controller); they stand for the *monitor* resource type.
|
|
Rename the "qxl_resourcetype" variable to "monitor_resourcetype".
|
|
|
|
Also document the ovirt-engine bugzilla for which resource type 32768 had
|
|
been introduced to ovirt-engine (RHBZ#1534644).
|
|
|
|
References:
|
|
|
|
- ovirt-engine commit 4dc21c0fcf3b ("core: align hardware resource type
|
|
with ovf specification", 2018-02-14)
|
|
|
|
- [Libguestfs] specifying a standard VGA video controller in OVF for oVirt
|
|
https://listman.redhat.com/archives/libguestfs/2021-November/msg00149.html
|
|
|
|
Fixes: 5d078f1f324bc121f3aa29cb87768ffa69385b6f
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1961107
|
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
---
|
|
lib/create_ovf.ml | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/lib/create_ovf.ml b/lib/create_ovf.ml
|
|
index 3991b66dd95d..8c8ef43a42cd 100644
|
|
--- a/lib/create_ovf.ml
|
|
+++ b/lib/create_ovf.ml
|
|
@@ -679,14 +679,15 @@ let rec create_ovf source inspect
|
|
* See RHBZ#1213701 and RHBZ#1211231 for the reasoning
|
|
* behind that.
|
|
*)
|
|
- let qxl_resourcetype =
|
|
+ let monitor_resourcetype =
|
|
match ovf_flavour with
|
|
- | OVirt -> 32768 (* RHBZ#1598715 *)
|
|
+ | OVirt -> 32768 (* RHBZ#1598715, RHBZ#1534644 *)
|
|
| RHVExportStorageDomain -> 20 in
|
|
e "Item" [] [
|
|
e "rasd:Caption" [] [PCData "Graphical Controller"];
|
|
e "rasd:InstanceId" [] [PCData (uuidgen ())];
|
|
- e "rasd:ResourceType" [] [PCData (string_of_int qxl_resourcetype)];
|
|
+ e "rasd:ResourceType" []
|
|
+ [PCData (string_of_int monitor_resourcetype)];
|
|
e "Type" [] [PCData "video"];
|
|
e "rasd:VirtualQuantity" [] [PCData "1"];
|
|
e "rasd:Device" [] [PCData "qxl"];
|
|
--
|
|
2.19.1.3.g30247aa5d201
|
|
|