From 0d324e3923dbda5073eb26ec4dd26e9511c1457e Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 27 Jun 2024 14:40:48 +0200
Subject: [qemu] Check for alternate way to make an EFI VM

Fixes #3960
---
 .../configuration/TransformationSpecificQemuMdevPassthroughIntel.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuMdevPassthroughIntel.java b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuMdevPassthroughIntel.java
index 303befab..87206714 100644
--- a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuMdevPassthroughIntel.java
+++ b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuMdevPassthroughIntel.java
@@ -11,6 +11,7 @@ import org.openslx.libvirt.domain.device.Video;
 import org.openslx.runvirt.plugin.qemu.cmdln.CommandLineArgs;
 import org.openslx.runvirt.plugin.qemu.virtualization.LibvirtHypervisorQemu;
 import org.openslx.runvirt.virtualization.LibvirtHypervisorException;
+import org.openslx.util.Util;
 import org.openslx.virtualization.configuration.transformation.TransformationException;
 import org.openslx.virtualization.configuration.transformation.TransformationSpecific;
 
@@ -116,7 +117,7 @@ public class TransformationSpecificQemuMdevPassthroughIntel
 			mdevDevice.setMemoryFramebufferOn( true );
 			mdevDevice.setSource( mdevDeviceAddress );
 
-			if ( config.getOsLoader() != null && !config.getOsLoader().isEmpty() ) {
+			if ( !Util.isEmptyString( config.getOsLoader() ) || "efi".equalsIgnoreCase( config.getOsFirmware() ) ) {
 				// set Intel specific rom file for GVT-g if UEFI loader is used
 				config.addGvtg( INTEL_GVT_G_UEFI_ROMFILE );
 			} else {
-- 
cgit v1.2.3-55-g7522