Support for Virtio graphics

Sources/diavirt/CannedMac.swift

@@ -59,7 +59,8 @@ func createCannedMac() -> DAVirtualMachineConfiguration {
                             pixelsPerInch: 80
                         )
                     ]
-                )
+                ),
+                virtioGraphicsDevice: .init(scanouts: [])
             )
         ],
         directorySharingDevices: [

Sources/diavirt/ConfigurationBuilder.swift

@@ -448,7 +448,17 @@ extension DAVirtioNetworkDevice {
 
 extension DAGraphicsDevice {
     func build() throws -> VZGraphicsDeviceConfiguration {
-        try (macGraphicsDevice?.build())!
+        var device: VZGraphicsDeviceConfiguration?
+
+        if let macGraphicsDevice {
+            device = try macGraphicsDevice.build()
+        }
+
+        if let virtioGraphicsDevice {
+            device = try virtioGraphicsDevice.build()
+        }
+
+        return device!
     }
 }
 
@@ -469,6 +479,22 @@ extension DAMacGraphicsDisplay {
     }
 }
 
+extension DAVirtioGraphicsDevice {
+    func build() throws -> VZVirtioGraphicsDeviceConfiguration {
+        let device = VZVirtioGraphicsDeviceConfiguration()
+        let scanouts = try scanouts.map { scanout in try scanout.build() }
+        device.scanouts = scanouts
+        return device
+    }
+}
+
+extension DAVirtioGraphicsScanout {
+    func build() throws -> VZVirtioGraphicsScanoutConfiguration {
+        VZVirtioGraphicsScanoutConfiguration(widthInPixels: widthInPixels,
+                                             heightInPixels: heightInPixels)
+    }
+}
+
 extension DADirectorySharingDevice {
     func build() throws -> VZDirectorySharingDeviceConfiguration {
         let share = try directoryShare.build()

Sources/diavirt/ConfigurationModel.swift

@@ -140,6 +140,7 @@ struct DANATNetworkAttachment: Codable {}
 
 struct DAGraphicsDevice: Codable {
     let macGraphicsDevice: DAMacGraphicsDevice?
+    let virtioGraphicsDevice: DAVirtioGraphicsDevice?
 }
 
 struct DAMacGraphicsDevice: Codable {
@@ -152,6 +153,15 @@ struct DAMacGraphicsDisplay: Codable {
     let pixelsPerInch: Int
 }
 
+struct DAVirtioGraphicsScanout: Codable {
+    let widthInPixels: Int
+    let heightInPixels: Int
+}
+
+struct DAVirtioGraphicsDevice: Codable {
+    let scanouts: [DAVirtioGraphicsScanout]
+}
+
 struct DADirectorySharingDevice: Codable {
     let virtioFileSystemDevice: DAVirtioFileSystemDevice?
     let directoryShare: DADirectoryShare

Sources/diavirt/EntryPoint.swift

@@ -111,14 +111,19 @@ struct DiavirtCommand: ParsableCommand {
         }
 
         Task {
-            try await Global.machine!.create()
+            do {
+                try await Global.machine!.create()
+            } catch {
+                DiavirtCommand.exit(withError: error)
+            }
+
             Global.machine?.start()
             Global.stateObserverHandle = Global.machine!.watchForState { state in
                 Task {
                     if state == .error {
                         DiavirtCommand.exit(withError: ExitCode.failure)
                     } else if state == .stopped {
-                        DiavirtCommand.exit(withError: ExitCode.success)
+                        // DiavirtCommand.exit(withError: ExitCode.success)
                     }
                 }
             }

diavirt.xcodeproj/project.pbxproj

@@ -235,7 +235,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 12.0;
+				MACOSX_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -293,7 +293,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 12.0;
+				MACOSX_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = macosx;

diavirt.xcodeproj/xcshareddata/xcschemes/diavirt.xcscheme

@@ -36,7 +36,7 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "YES"
-      customWorkingDirectory = "$(PROJECT_DIR)/work/mac"
+      customWorkingDirectory = "$(PROJECT_DIR)/work/alpine"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
@@ -53,11 +53,11 @@
       </BuildableProductRunnable>
       <CommandLineArguments>
          <CommandLineArgument
-            argument = "-w"
+            argument = "-v"
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "-v"
+            argument = "-w"
             isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>