[qemu] Add workaround for weird qemu crash with edk2 on Alderlake

... at least one specific model with P and E cores ...

2 files changed, 68 insertions, 2 deletions

diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/App.java b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/App.java
index a5349316..6a0dc9cb 100644
--- a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/App.java
+++ b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/App.java
@@ -27,6 +27,7 @@ import org.openslx.runvirt.plugin.qemu.configuration.TransformationGenericName;
 import org.openslx.runvirt.plugin.qemu.configuration.TransformationGenericParallelDevices;
 import org.openslx.runvirt.plugin.qemu.configuration.TransformationSpecificQemuSerialDevices;
 import org.openslx.runvirt.plugin.qemu.configuration.TransformationGenericUuid;
+import org.openslx.runvirt.plugin.qemu.configuration.TransformationGenericWrapperScript;
 import org.openslx.runvirt.plugin.qemu.configuration.TransformationSpecificQemuArchitecture;
 import org.openslx.runvirt.plugin.qemu.configuration.TransformationSpecificQemuFirmware;
 import org.openslx.runvirt.plugin.qemu.configuration.TransformationSpecificQemuGpuPassthroughNvidia;
@@ -162,6 +163,9 @@ public class App
 			transformationManager.register( new TransformationSpecificQemuGpuPassthroughNvidia( hypervisorQemu ), false );
 		}
 
+		// Needs to be last one since TransformationSpecificQemuArchitecture sets this too
+		transformationManager.register( new TransformationGenericWrapperScript(), true );
+
 		// finalize Libvirt VM configuration template
 		try {
 			transformationManager.transform();
@@ -202,9 +206,8 @@ public class App
 				final File xmlOutputFile = new File( xmlOutputFileName );
 				config.toXml( xmlOutputFile );
 			} catch ( NullPointerException | LibvirtXmlSerializationException e ) {
+				// We only call this for debugging purposes, don't bail out but log
 				LOGGER.error( "Failed to write VM output configuration file: " + e.getLocalizedMessage() );
-				hypervisor.close();
-				System.exit( 5 );
 			}
 		}
 
diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericWrapperScript.java b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericWrapperScript.java
new file mode 100644
index 00000000..60c98d47
--- /dev/null
+++ b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericWrapperScript.java
@@ -0,0 +1,63 @@
+package org.openslx.runvirt.plugin.qemu.configuration;
+
+import java.io.File;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.openslx.libvirt.domain.Domain;
+import org.openslx.runvirt.plugin.qemu.cmdln.CommandLineArgs;
+import org.openslx.util.Util;
+import org.openslx.virtualization.configuration.transformation.TransformationException;
+import org.openslx.virtualization.configuration.transformation.TransformationGeneric;
+
+/**
+ * Use openslx wrapper script for launching the emulator (virtualizer)
+ * 
+ * @author sr
+ */
+public class TransformationGenericWrapperScript extends TransformationGeneric<Domain, CommandLineArgs>
+{
+	/**
+	 * Instance of a logger to log messages.
+	 */
+	private static final Logger LOGGER = LogManager.getLogger( TransformationGenericWrapperScript.class );
+
+	/**
+	 * Name of the configuration transformation.
+	 */
+	private static final String NAME = "Use wrapper script for emulator if found";
+
+	/**
+	 * Extension for the wrapper we look for
+	 */
+	private static final String WRAPPER_EXT = ".openslx";
+
+	public TransformationGenericWrapperScript()
+	{
+		super( TransformationGenericWrapperScript.NAME );
+	}
+
+	/**
+	 * Validates a virtualization configuration and input arguments for this transformation.
+	 */
+	private void validateInputs( Domain config, CommandLineArgs args ) throws TransformationException
+	{
+		if ( config == null || args == null ) {
+			throw new TransformationException( "Virtualization configuration or input arguments are missing!" );
+		}
+	}
+
+	@Override
+	public void transform( Domain config, CommandLineArgs args ) throws TransformationException
+	{
+		// validate configuration and input arguments
+		this.validateInputs( config, args );
+
+		// Use our wrapper if it exists
+		String emu = config.getDevicesEmulator();
+		if ( !Util.isEmptyString( emu ) && new File( emu + WRAPPER_EXT ).canExecute() ) {
+			LOGGER.info( "Using emulator wrapper " + emu + WRAPPER_EXT );
+			config.setDevicesEmulator( emu + WRAPPER_EXT );
+		}
+	}
+}