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

…n macOS

src/operating_systems/openbsd/openbsd.ts

@@ -6,7 +6,7 @@ import * as core from '@actions/core'
 import * as architecture from '../../architecture'
 import {operatingSystem} from '../factory'
 import * as vmModule from '../../vm'
-import {QemuVm} from './qemu_vm'
+import {QemuVm, QemuVmX86_64} from './qemu_vm'
 import * as os from '../../operating_system'
 import versions from '../../version'
 import {XhyveVm} from './xhyve_vm'
@@ -65,7 +65,9 @@ export default class OpenBsd extends os.OperatingSystem {
       uuid: this.uuid
     }
 
-    const cls = this.hypervisor.resolve({qemu: QemuVm, xhyve: XhyveVm})
+    let cls = this.hypervisor.resolve({qemu: QemuVm, xhyve: XhyveVm})
+    cls = this.architecture.resolve({x86_64: QemuVmX86_64, default: cls})
+
     return new cls(
       hypervisorDirectory,
       resourcesDirectory,

src/operating_systems/openbsd/qemu_vm.ts

@@ -9,3 +9,10 @@ export class QemuVm extends Vm {
     return this.architecture.networkDevice
   }
 }
+
+export class QemuVmX86_64 extends QemuVm {
+  protected override get cpuidFlags(): string[] {
+    // disable huge pages, otherwise OpenBSD will not boot: https://gitlab.com/qemu-project/qemu/-/issues/1091
+    return ['-pdpe1gb']
+  }
+}

src/qemu_vm.ts

@@ -36,8 +36,7 @@ export abstract class Vm extends vm.Vm {
       this.hypervisorPath.toString(),
       '-daemonize',
       '-machine', `type=${this.configuration.machineType},accel=${accel}`,
-      // "-pdpe1gb" == disable huge pages, otherwise OpenBSD will not boot: https://gitlab.com/qemu-project/qemu/-/issues/1091
-      '-cpu', `${this.configuration.cpu},-pdpe1gb`,
+      '-cpu', this.cpuFlagValue,
       '-smp', this.configuration.cpuCount.toString(),
       '-m', this.configuration.memory,
 
@@ -78,6 +77,10 @@ export abstract class Vm extends vm.Vm {
     return ''
   }
 
+  protected get cpuidFlags(): string[] {
+    return []
+  }
+
   private get netdev(): string {
     return [
       'user',
@@ -88,6 +91,10 @@ export abstract class Vm extends vm.Vm {
       .filter(e => e !== '')
       .join(',')
   }
+
+  private get cpuFlagValue(): string {
+    return [this.configuration.cpu, ...this.cpuidFlags].join(',')
+  }
 }
 
 export function resolve<T>(implementation: Record<string, T>): T {