Update backend and rework rendering pipeline

Managers/UTMQemuVirtualMachine.m

@@ -645,7 +645,11 @@ - (void)parseCharDeviceLine:(NSString *)line {
 #pragma mark - Screenshot
 
 - (void)updateScreenshot {
- self.screenshot = [self.ioService screenshot];
+ [self.ioService screenshotWithCompletion:^(CSScreenshot * _Nullable screenshot) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self.screenshot = screenshot;
+ });
+ }];
 }
 
 @end

Managers/UTMSpiceIO.h

@@ -42,7 +42,6 @@ NS_ASSUME_NONNULL_BEGIN
 #endif
 @property (nonatomic, weak, nullable) id<UTMSpiceIODelegate> delegate;
 @property (nonatomic, readonly) BOOL isConnected;
-@property (nonatomic, readonly, nullable) CSScreenshot *screenshot;
 
 - (instancetype)init NS_UNAVAILABLE;
 - (instancetype)initWithConfiguration:(UTMConfigurationWrapper *)configuration NS_DESIGNATED_INITIALIZER;
@@ -52,6 +51,8 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)connectWithCompletion:(ioConnectCompletionHandler_t)block;
 - (void)disconnect;
 
+- (void)screenshotWithCompletion:(screenshotCallback_t)completion;
+
 @end
 
 NS_ASSUME_NONNULL_END

Managers/UTMSpiceIO.m

@@ -153,8 +153,8 @@ - (void)disconnect {
 #endif
 }
 
-- (CSScreenshot *)screenshot {
- return [self.primaryDisplay screenshot];
+- (void)screenshotWithCompletion:(screenshotCallback_t)completion {
+ return [self.primaryDisplay screenshotWithCompletion:completion];
 }
 
 #pragma mark - CSConnectionDelegate

UTM.xcodeproj/project.pbxproj

@@ -292,6 +292,16 @@
  CE020BAC24AEE00000B44AB6 /* UTMLoggingSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE020BAA24AEE00000B44AB6 /* UTMLoggingSwift.swift */; };
  CE020BB624B14F8400B44AB6 /* UTMVirtualMachine.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE020BB524B14F8400B44AB6 /* UTMVirtualMachine.swift */; };
  CE020BB724B14F8400B44AB6 /* UTMVirtualMachine.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE020BB524B14F8400B44AB6 /* UTMVirtualMachine.swift */; };
+ CE02C8AA294EE4EB006DFE48 /* qemu-loongarch64-softmmu.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE02C8A8294EE4EA006DFE48 /* qemu-loongarch64-softmmu.framework */; };
+ CE02C8AB294EE4EB006DFE48 /* qemu-loongarch64-softmmu.framework in Embed Libraries */ = {isa = PBXBuildFile; fileRef = CE02C8A8294EE4EA006DFE48 /* qemu-loongarch64-softmmu.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+ CE02C8AC294EE4EC006DFE48 /* slirp.0.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE02C8A9294EE4EB006DFE48 /* slirp.0.framework */; };
+ CE02C8AD294EE4EC006DFE48 /* slirp.0.framework in Embed Libraries */ = {isa = PBXBuildFile; fileRef = CE02C8A9294EE4EB006DFE48 /* slirp.0.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+ CE02C8B1294EE58C006DFE48 /* slirp.0.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE02C8A9294EE4EB006DFE48 /* slirp.0.framework */; };
+ CE02C8B2294EE58C006DFE48 /* slirp.0.framework in Embed Libraries */ = {isa = PBXBuildFile; fileRef = CE02C8A9294EE4EB006DFE48 /* slirp.0.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+ CE02C8B3294EE59A006DFE48 /* slirp.0.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE02C8A9294EE4EB006DFE48 /* slirp.0.framework */; };
+ CE02C8B4294EE59A006DFE48 /* slirp.0.framework in Embed Libraries */ = {isa = PBXBuildFile; fileRef = CE02C8A9294EE4EB006DFE48 /* slirp.0.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+ CE02C8B5294EE59F006DFE48 /* qemu-loongarch64-softmmu.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE02C8A8294EE4EA006DFE48 /* qemu-loongarch64-softmmu.framework */; };
+ CE02C8B6294EE59F006DFE48 /* qemu-loongarch64-softmmu.framework in Embed Libraries */ = {isa = PBXBuildFile; fileRef = CE02C8A8294EE4EA006DFE48 /* qemu-loongarch64-softmmu.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
  CE03D05224D90B4E00F76B84 /* UTMQemuSystem.m in Sources */ = {isa = PBXBuildFile; fileRef = CE03D05024D90B4E00F76B84 /* UTMQemuSystem.m */; };
  CE03D05324D90B4E00F76B84 /* UTMQemuSystem.m in Sources */ = {isa = PBXBuildFile; fileRef = CE03D05024D90B4E00F76B84 /* UTMQemuSystem.m */; };
  CE03D08624D90F0700F76B84 /* gmodule-2.0.0.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE2D63D822653C7300FC7E63 /* gmodule-2.0.0.framework */; };
@@ -1404,6 +1414,7 @@
  CE0DF19625A83C1700A51894 /* qemu-arm-softmmu.framework in Embed Libraries */,
  CE0DF19725A83C1700A51894 /* qemu-cris-softmmu.framework in Embed Libraries */,
  CE0DF19825A83C1700A51894 /* qemu-hppa-softmmu.framework in Embed Libraries */,
+ CE02C8B4294EE59A006DFE48 /* slirp.0.framework in Embed Libraries */,
  84937F0028960789003148F4 /* zstd.1.framework in Embed Libraries */,
  CEA9054225F982C400801E7C /* usb-1.0.0.framework in Embed Libraries */,
  CE0DF19925A83C1700A51894 /* qemu-i386-softmmu.framework in Embed Libraries */,
@@ -1422,6 +1433,7 @@
  CE0DF1A725A83C1700A51894 /* qemu-riscv64-softmmu.framework in Embed Libraries */,
  CE0DF1A825A83C1700A51894 /* qemu-s390x-softmmu.framework in Embed Libraries */,
  CE0DF1A925A83C1700A51894 /* qemu-sh4-softmmu.framework in Embed Libraries */,
+ CE02C8B6294EE59F006DFE48 /* qemu-loongarch64-softmmu.framework in Embed Libraries */,
  CE0DF1AA25A83C1700A51894 /* qemu-sh4eb-softmmu.framework in Embed Libraries */,
  CE0DF1AB25A83C1700A51894 /* qemu-sparc-softmmu.framework in Embed Libraries */,
  CE0DF1AC25A83C1700A51894 /* qemu-sparc64-softmmu.framework in Embed Libraries */,
@@ -1453,6 +1465,7 @@
  CE2D937C24AD46670059923A /* ssl.1.1.framework in Embed Libraries */,
  CEA9059125FC6A3300801E7C /* usbredirhost.1.framework in Embed Libraries */,
  CE2D937D24AD46670059923A /* gio-2.0.0.framework in Embed Libraries */,
+ CE02C8AD294EE4EC006DFE48 /* slirp.0.framework in Embed Libraries */,
  CE2D937E24AD46670059923A /* png16.16.framework in Embed Libraries */,
  CE2D937F24AD46670059923A /* gstnet-1.0.0.framework in Embed Libraries */,
  CE2D938024AD46670059923A /* qemu-cris-softmmu.framework in Embed Libraries */,
@@ -1506,6 +1519,7 @@
  CE2D93AB24AD46670059923A /* opus.0.framework in Embed Libraries */,
  CE2D93AD24AD46670059923A /* gstsdp-1.0.0.framework in Embed Libraries */,
  CE2D93AE24AD46670059923A /* qemu-nios2-softmmu.framework in Embed Libraries */,
+ CE02C8AB294EE4EB006DFE48 /* qemu-loongarch64-softmmu.framework in Embed Libraries */,
  CE2D93B024AD46670059923A /* gstaudio-1.0.0.framework in Embed Libraries */,
  CE2D93B124AD46670059923A /* gstcheck-1.0.0.framework in Embed Libraries */,
  CE2D93B224AD46670059923A /* qemu-xtensa-softmmu.framework in Embed Libraries */,
@@ -1576,6 +1590,7 @@
  CEA45FA8263519B5002FA97D /* spice-client-glib-2.0.8.framework in Embed Libraries */,
  CEA45FA9263519B5002FA97D /* opus.0.framework in Embed Libraries */,
  CEA45FAA263519B5002FA97D /* gstsdp-1.0.0.framework in Embed Libraries */,
+ CE02C8B2294EE58C006DFE48 /* slirp.0.framework in Embed Libraries */,
  CEA45FAC263519B5002FA97D /* gstaudio-1.0.0.framework in Embed Libraries */,
  CEA45FAD263519B5002FA97D /* gstcheck-1.0.0.framework in Embed Libraries */,
  CEA45FAF263519B5002FA97D /* iconv.2.framework in Embed Libraries */,
@@ -1792,6 +1807,8 @@
  CE020BA224AEDC7C00B44AB6 /* UTMData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UTMData.swift; sourceTree = "<group>"; };
  CE020BAA24AEE00000B44AB6 /* UTMLoggingSwift.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UTMLoggingSwift.swift; sourceTree = "<group>"; };
  CE020BB524B14F8400B44AB6 /* UTMVirtualMachine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UTMVirtualMachine.swift; sourceTree = "<group>"; };
+ CE02C8A8294EE4EA006DFE48 /* qemu-loongarch64-softmmu.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "qemu-loongarch64-softmmu.framework"; path = "$(SYSROOT_DIR)/Frameworks/qemu-loongarch64-softmmu.framework"; sourceTree = "<group>"; };
+ CE02C8A9294EE4EB006DFE48 /* slirp.0.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = slirp.0.framework; path = "$(SYSROOT_DIR)/Frameworks/slirp.0.framework"; sourceTree = "<group>"; };
  CE03D05024D90B4E00F76B84 /* UTMQemuSystem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UTMQemuSystem.m; sourceTree = "<group>"; };
  CE03D05424D90BE000F76B84 /* UTMQemuSystem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UTMQemuSystem.h; sourceTree = "<group>"; };
  CE03D0D024D9A62B00F76B84 /* QEMUHelper.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = QEMUHelper.entitlements; sourceTree = "<group>"; };
@@ -2358,6 +2375,7 @@
  CE2D933A24AD46670059923A /* libgstaudiorate.a in Frameworks */,
  B3DDF57226E9BBA300CE47F0 /* AltKit in Frameworks */,
  CE2D933B24AD46670059923A /* libgstvideofilter.a in Frameworks */,
+ CE02C8AA294EE4EB006DFE48 /* qemu-loongarch64-softmmu.framework in Frameworks */,
  84018695288B66370050AC51 /* SwiftUIVisualEffects in Frameworks */,
  84937F1D289767EC003148F4 /* zstd.1.framework in Frameworks */,
  CE2D933C24AD46670059923A /* libgstapp.a in Frameworks */,
@@ -2383,6 +2401,7 @@
  CE2D934E24AD46670059923A /* gstbase-1.0.0.framework in Frameworks */,
  CE020BA724AEDEF000B44AB6 /* Logging in Frameworks */,
  8401865A2887AFD50050AC51 /* SwiftTerm in Frameworks */,
+ CE02C8AC294EE4EC006DFE48 /* slirp.0.framework in Frameworks */,
  CE2D934F24AD46670059923A /* phodav-2.0.0.framework in Frameworks */,
  CEA9059025FC6A1700801E7C /* usbredirparser.1.framework in Frameworks */,
  CE0E9B87252FD06B0026E02B /* SwiftUI.framework in Frameworks */,
@@ -2427,6 +2446,7 @@
  CE0B6EF024AD677200FE012D /* gstcontroller-1.0.0.framework in Frameworks */,
  CE0B6EE024AD677200FE012D /* libgstosxaudio.a in Frameworks */,
  CE0B6F0D24AD677200FE012D /* libgstadder.a in Frameworks */,
+ CE02C8B3294EE59A006DFE48 /* slirp.0.framework in Frameworks */,
  CE0B6EF224AD677200FE012D /* gstallocators-1.0.0.framework in Frameworks */,
  CE03D08B24D90F2900F76B84 /* jpeg.62.framework in Frameworks */,
  CE0B6EBC24AD677200FE012D /* gstpbutils-1.0.0.framework in Frameworks */,
@@ -2469,6 +2489,7 @@
  CE0B6EE724AD677200FE012D /* libgstvideotestsrc.a in Frameworks */,
  CE0B6EBB24AD677200FE012D /* libgstgio.a in Frameworks */,
  84937EFF28960789003148F4 /* zstd.1.framework in Frameworks */,
+ CE02C8B5294EE59F006DFE48 /* qemu-loongarch64-softmmu.framework in Frameworks */,
  CE0B6EE224AD677200FE012D /* gstnet-1.0.0.framework in Frameworks */,
  CE03D08624D90F0700F76B84 /* gmodule-2.0.0.framework in Frameworks */,
  CE03D0CA24D9142000F76B84 /* ssl.1.1.framework in Frameworks */,
@@ -2515,6 +2536,7 @@
  CEA45F2F263519B5002FA97D /* libgstaudioresample.a in Frameworks */,
  CEA45F30263519B5002FA97D /* libgstplayback.a in Frameworks */,
  CEA45F31263519B5002FA97D /* libgstadder.a in Frameworks */,
+ CE02C8B1294EE58C006DFE48 /* slirp.0.framework in Frameworks */,
  CEA45F32263519B5002FA97D /* libgstaudiorate.a in Frameworks */,
  CEA45F33263519B5002FA97D /* libgstvideofilter.a in Frameworks */,
  CEA45F34263519B5002FA97D /* libgstapp.a in Frameworks */,
@@ -2637,6 +2659,8 @@
  CE2D63D622653C7300FC7E63 /* Frameworks */ = {
  isa = PBXGroup;
  children = (
+ CE02C8A8294EE4EA006DFE48 /* qemu-loongarch64-softmmu.framework */,
+ CE02C8A9294EE4EB006DFE48 /* slirp.0.framework */,
  84C5068528CA5702007CE8FF /* Hypervisor.framework */,
  84818C0B2898A07A009EDB67 /* AVFAudio.framework */,
  84937EFE28960789003148F4 /* zstd.1.framework */,

UTM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -15,7 +15,7 @@
  "location" : "https://github.com/utmapp/CocoaSpice.git",
  "state" : {
  "branch" : "main",
- "revision" : "33f9e8e7cee801137238d33b793b92392d7a9854"
+ "revision" : "89fabc654b65568fae5192c1547023cfe333c2df"
  }
  },
  {

patches/gst-plugins-good-1.19.1.patch

@@ -0,0 +1,24 @@
+diff -Naur a/sys/osxaudio/gstosxcoreaudiocommon.c b/sys/osxaudio/gstosxcoreaudiocommon.c
+--- a/sys/osxaudio/gstosxcoreaudiocommon.c 2021-05-31 16:11:47.000000000 -0700
++++ b/sys/osxaudio/gstosxcoreaudiocommon.c 2022-12-24 23:00:48.000000000 -0800
+@@ -137,15 +137,16 @@
+ "osx ring buffer stop ioproc: %p device_id %lu",
+ core_audio->element->io_proc, (gulong) core_audio->device_id);
+
++ // ###: why is it okay to directly remove from here but not from pause() ?
++ if (core_audio->io_proc_active) {
++ gst_core_audio_remove_render_callback (core_audio);
++ }
++
+ status = AudioOutputUnitStop (core_audio->audiounit);
+ if (status) {
+ GST_WARNING_OBJECT (core_audio->osxbuf,
+ "AudioOutputUnitStop failed: %d", (int) status);
+ }
+- // ###: why is it okay to directly remove from here but not from pause() ?
+- if (core_audio->io_proc_active) {
+- gst_core_audio_remove_render_callback (core_audio);
+- }
+ return TRUE;
+ }
+

patches/libslirp-v4.7.0.patch

@@ -0,0 +1,25 @@
+From 23019cdeb76de066cf3f05a599817e2ac6306747 Mon Sep 17 00:00:00 2001
+From: osy <osy@turing.llc>
+Date: Sat, 17 Dec 2022 20:10:22 -0800
+Subject: [PATCH] meson: add libresolv for iOS builds
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 5605dc9..f6d128e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -62,7 +62,7 @@ if host_system == 'windows'
+ cc.find_library('ws2_32'),
+ cc.find_library('iphlpapi')
+ ]
+-elif host_system == 'darwin'
++elif host_system == 'darwin' or host_system == 'ios'
+ platform_deps += [
+ cc.find_library('resolv')
+ ]
+-- 
+2.28.0
+