Merge remote-tracking branch 'origin/main' into testing

mnlipp · Nov 12, 2024 · 5ec7f58 · 5ec7f58
2 parents 5897b4b + 2283227
commit 5ec7f58
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...jdrupes.vmoperator.runner.qemu/resources/org/jdrupes/vmoperator/runner/qemu/defaults.yaml b/...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"

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
@@ -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 void onStart(Start event) {
         // 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