From 42bc3fe667d4781eda638d90dbb35dc58440f2ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Sim=C3=B3n?= <varosim@gmail.com>
Date: Mon, 30 Sep 2024 15:31:53 +0200
Subject: [PATCH] ncm-opennebula: do not use qxl video driver

qxl is not supported any more in RHEL9 and it should be removed.
OpenNebula should use the correct video driver automatically.

Resolves:  #1722
---
 ncm-opennebula/src/main/resources/raw_level1.tt                  | 1 -
 .../src/main/resources/tests/regexps/aii_vmtemplate/vm_template  | 1 -
 ncm-opennebula/src/test/perl/rpcdata.pm                          | 1 -
 3 files changed, 3 deletions(-)

diff --git a/ncm-opennebula/src/main/resources/raw_level1.tt b/ncm-opennebula/src/main/resources/raw_level1.tt
index 98ab60c600..6da0af35de 100644
--- a/ncm-opennebula/src/main/resources/raw_level1.tt
+++ b/ncm-opennebula/src/main/resources/raw_level1.tt
@@ -1,6 +1,5 @@
 DATA = "<vcpu>[% vcpus %]</vcpu><cpu mode='host-passthrough'>
 <topology sockets='[% sockets %]' cores='[% cores %]' threads='1'/></cpu>
-<devices><video><model type='qxl'/></video></devices>
 [%- IF system.opennebula.memorybacking.defined %]
 <memoryBacking>
 [%-     FOREACH item IN system.opennebula.memorybacking %]
diff --git a/ncm-opennebula/src/main/resources/tests/regexps/aii_vmtemplate/vm_template b/ncm-opennebula/src/main/resources/tests/regexps/aii_vmtemplate/vm_template
index 47c64748b9..0f3e973c84 100644
--- a/ncm-opennebula/src/main/resources/tests/regexps/aii_vmtemplate/vm_template
+++ b/ncm-opennebula/src/main/resources/tests/regexps/aii_vmtemplate/vm_template
@@ -60,7 +60,6 @@ multiline
 ^RAW\s?=\s?\[$
 ^\s{4}DATA\s?=\s?"\<vcpu\>4\<\/vcpu\>\<cpu\s{1}mode\=\'host-passthrough\'\>$
 ^\s{4}\<topology\s{1}sockets\=\'2\'\s{1}cores\=\'2\'\s{1}threads\=\'1\'\/\>\<\/cpu\>$
-^\s{4}\<devices\>\<video\>\<model\s{1}type\=\'qxl\'\/\>\<\/video\>\<\/devices\>$
 ^\s{4}\<memoryBacking\>$
 ^\s{4}\<nosharepages\/\>$
 ^\s{4}\<hugepages\/\>$
diff --git a/ncm-opennebula/src/test/perl/rpcdata.pm b/ncm-opennebula/src/test/perl/rpcdata.pm
index 617bfdccc4..d03391cac6 100644
--- a/ncm-opennebula/src/test/perl/rpcdata.pm
+++ b/ncm-opennebula/src/test/perl/rpcdata.pm
@@ -908,7 +908,6 @@ OS = [
 RAW = [
     DATA = "<vcpu>4</vcpu><cpu mode='host-passthrough'>
     <topology sockets='2' cores='2' threads='1'/></cpu>
-    <devices><video><model type='qxl'/></video></devices>
     <memoryBacking>
     <nosharepages/>
     <hugepages/>