fixup! Fix #73: OpenBSD VM fails during "Initializing VM" with QEMU o…

…n macOS
cross-platform-actions · Jan 10, 2024 · 76f4def · 76f4def
1 parent 6c96e98
commit 76f4def
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/operating_systems/openbsd/qemu_vm.ts b/src/operating_systems/openbsd/qemu_vm.ts
@@ -15,4 +15,11 @@ export class QemuVmX86_64 extends QemuVm {
     // disable huge pages, otherwise OpenBSD will not boot: https://gitlab.com/qemu-project/qemu/-/issues/1091
     return ['-pdpe1gb']
   }
+
+  protected override get firmwareFlags(): string[] {
+    return [
+      '-drive',
+      `if=pflash,format=raw,unit=0,file=${this.configuration.firmware},readonly=on`
+    ]
+  }
 }
diff --git a/src/qemu_vm.ts b/src/qemu_vm.ts
@@ -48,8 +48,7 @@ export abstract class Vm extends vm.Vm {
       // '-nographic',
 
       '-boot', 'strict=off',
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-     '-bios', this.configuration.firmware!.toString(),
+      ...this.firmwareFlags,
       ...this.hardDriverFlags
     ]
   }
@@ -81,6 +80,10 @@ export abstract class Vm extends vm.Vm {
     return []
   }
 
+  protected get firmwareFlags(): string[] {
+    return ['-bios', this.configuration.firmware!.toString()]
+  }
+
   private get netdev(): string {
     return [
       'user',