From 40cbeb694bfd37aaa446b3d3ef80c8c56d4de1b3 Mon Sep 17 00:00:00 2001
From: "Michael N. Lipp" <mnl@mnl.de>
Date: Tue, 12 Nov 2024 22:04:15 +0100
Subject: [PATCH 1/2] Avoid NPE.

---
 .../src/org/jdrupes/vmoperator/runner/qemu/Runner.java       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java
index fedaf1e..52db0ce 100644
--- a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java
+++ b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java
@@ -204,7 +204,7 @@ public class Runner extends Component {
     private static final String FW_VARS = "fw-vars.fd";
     private static int exitStatus;
 
-    private EventPipeline rep;
+    private final EventPipeline rep = newEventPipeline();
     private final ObjectMapper yamlMapper = new ObjectMapper(YAMLFactory
         .builder().disable(YAMLGenerator.Feature.WRITE_DOC_START_MARKER)
         .build());
@@ -446,8 +446,7 @@ public class Runner extends Component {
         // https://github.com/kubernetes-client/java/issues/100
         io.kubernetes.client.openapi.Configuration.setDefaultApiClient(null);
 
-        // Prepare specific event pipeline to avoid concurrency.
-        rep = newEventPipeline();
+        // Provide specific event pipeline to avoid concurrency.
         event.setAssociated(EventPipeline.class, rep);
         try {
             // Store process id

From 228322748b494c9a3c9b1f1db755f9f4de7fe9c7 Mon Sep 17 00:00:00 2001
From: "Michael N. Lipp" <mnl@mnl.de>
Date: Tue, 12 Nov 2024 22:41:54 +0100
Subject: [PATCH 2/2] Use 4m bios if smaller version is not available.

---
 .../resources/org/jdrupes/vmoperator/runner/qemu/defaults.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/org.jdrupes.vmoperator.runner.qemu/resources/org/jdrupes/vmoperator/runner/qemu/defaults.yaml b/org.jdrupes.vmoperator.runner.qemu/resources/org/jdrupes/vmoperator/runner/qemu/defaults.yaml
index 9aadbf6..32fdf55 100644
--- a/org.jdrupes.vmoperator.runner.qemu/resources/org/jdrupes/vmoperator/runner/qemu/defaults.yaml
+++ b/org.jdrupes.vmoperator.runner.qemu/resources/org/jdrupes/vmoperator/runner/qemu/defaults.yaml
@@ -8,6 +8,9 @@
       - "/usr/share/edk2/ovmf/OVMF_CODE.fd"
       - "/usr/share/edk2/x64/OVMF_CODE.fd"
       - "/usr/share/OVMF/OVMF_CODE.fd"
+      # Use 4M version as fallback (if smaller version not available)
+      - "/usr/share/edk2/ovmf-4m/OVMF_CODE.fd"
+      - "/usr/share/edk2/x64/OVMF_CODE.4m.fd"
     "vars":
       - "/usr/share/edk2/ovmf/OVMF_VARS.fd"
       - "/usr/share/edk2/x64/OVMF_VARS.fd"