fixup! Add support for FreeBSD ARM64

src/architecture.ts

@@ -14,8 +14,9 @@ export enum Kind {
 
 export abstract class Architecture {
   readonly kind: Kind
+  readonly host: Host
+
   protected readonly resourceBaseUrl = ResourceUrls.create().resourceBaseUrl
-  protected readonly host: Host
 
   constructor(kind: Kind, host: Host) {
     this.kind = kind
@@ -62,7 +63,7 @@ export abstract class Architecture {
     return this.host.qemu
   }
 
-  private static readonly Arm64 = class extends Architecture {
+  static readonly Arm64 = class extends Architecture {
     override get name(): string {
       return 'arm64'
     }

src/operating_systems/freebsd/arm64.ts

@@ -0,0 +1,8 @@
+import {Architecture} from '../../architecture'
+import {Hypervisor} from '../../hypervisor'
+
+export default class Arm64 extends Architecture.Arm64 {
+  override get hypervisor(): Hypervisor {
+    return this.host.efiHypervisor
+  }
+}

src/operating_systems/freebsd/factory.ts

@@ -1,3 +1,5 @@
+import * as architecture from '../../architecture'
+import Arm64 from './arm64'
 import {Hypervisor, Kind as HypervisorKind} from '../../hypervisor'
 import {OperatingSystem} from '../../operating_system'
 import {factory, Factory as BaseFactory} from '../factory'
@@ -11,10 +13,18 @@ class FreeBsdFactory extends BaseFactory {
   }
 
   override create(version: string, hypervisor: Hypervisor): OperatingSystem {
-    return new FreeBsd(this.architecture, version, hypervisor)
+    return new FreeBsd(this.resolveArchitecture(), version, hypervisor)
   }
 
   override validateHypervisor(kind: HypervisorKind): void {
     this.architecture.validateHypervisor(kind)
   }
+
+  private resolveArchitecture(): architecture.Architecture {
+    if (this.architecture.kind == architecture.Kind.arm64) {
+      return new Arm64(this.architecture.kind, this.architecture.host)
+    }
+
+    return this.architecture
+  }
 }

src/operating_systems/freebsd/freebsd.ts

@@ -75,7 +75,7 @@ export default class FreeBsd extends os.OperatingSystem {
       ssHostPort: this.ssHostPort,
       firmware: path.join(
         firmwareDirectory.toString(),
-        this.architecture.efiHypervisor.firmwareFile
+        this.architecture.hypervisor.firmwareFile
       ),
 
       // qemu