fixed issue 50

.github/workflows/compile.yml

@@ -27,6 +27,7 @@ jobs:
       fail-fast: false
       matrix:
         os:
+        - macOS-11
         - macOS-12
         go:
         - 1.17

issues_test.go

@@ -0,0 +1,63 @@
+package vz
+
+import (
+	"os"
+	"testing"
+)
+
+func TestIssue50(t *testing.T) {
+	f, err := os.CreateTemp("", "vmlinuz")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer f.Close()
+
+	bootloader, err := NewLinuxBootLoader(f.Name())
+	if err != nil {
+		t.Fatal(err)
+	}
+	config, err := NewVirtualMachineConfiguration(bootloader, 1, 1024*1024*1024)
+	if err != nil {
+		t.Fatal(err)
+	}
+	ok, err := config.Validate()
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !ok {
+		t.Fatal("failed to validate config")
+	}
+	m, err := NewVirtualMachine(config)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	t.Run("check for segmentation faults", func(t *testing.T) {
+		cases := map[string]func(){
+			"start handler": func() {
+				m.Start(func(err error) { _ = err == nil })
+			},
+			"pause handler": func() {
+				m.Pause(func(err error) { _ = err == nil })
+			},
+			"resume handler": func() {
+				m.Resume(func(err error) { _ = err == nil })
+			},
+			"stop handler": func() {
+				m.Stop(func(err error) { _ = err == nil })
+			},
+		}
+		for name, run := range cases {
+			t.Run(name, func(t *testing.T) {
+				run()
+			})
+		}
+	})
+}
+
+func TestIssue71(t *testing.T) {
+	_, err := NewFileSerialPortAttachment("/non/existing/path", false)
+	if err == nil {
+		t.Error("NewFileSerialPortAttachment should have returned an error")
+	}
+}

virtualization.h

@@ -6,7 +6,6 @@
 
 #pragma once
 
-#import "virtualization_raise.h"
 #import <Foundation/Foundation.h>
 #import <Virtualization/Virtualization.h>
 

virtualization.m

@@ -5,6 +5,7 @@
 //
 
 #import "virtualization.h"
+#import "virtualization_helper.h"
 #import "virtualization_view.h"
 
 char *copyCString(NSString *nss)
@@ -1059,14 +1060,23 @@ bool requestStopVirtualMachine(void *machine, void *queue, void **error)
     return queue;
 }
 
+typedef void (^vm_completion_handler_t)(NSError *);
+
+vm_completion_handler_t makeVMCompletionHandler(void *completionHandler)
+{
+    return Block_copy(^(NSError *err) {
+        virtualMachineCompletionHandler(completionHandler, err);
+    });
+}
+
 void startWithCompletionHandler(void *machine, void *queue, void *completionHandler)
 {
     if (@available(macOS 11, *)) {
+        vm_completion_handler_t handler = makeVMCompletionHandler(completionHandler);
         dispatch_sync((dispatch_queue_t)queue, ^{
-            [(VZVirtualMachine *)machine startWithCompletionHandler:^(NSError *err) {
-                virtualMachineCompletionHandler(completionHandler, err);
-            }];
+            [(VZVirtualMachine *)machine startWithCompletionHandler:handler];
         });
+        Block_release(handler);
         return;
     }
 
@@ -1076,11 +1086,11 @@ void startWithCompletionHandler(void *machine, void *queue, void *completionHand
 void pauseWithCompletionHandler(void *machine, void *queue, void *completionHandler)
 {
     if (@available(macOS 11, *)) {
+        vm_completion_handler_t handler = makeVMCompletionHandler(completionHandler);
         dispatch_sync((dispatch_queue_t)queue, ^{
-            [(VZVirtualMachine *)machine pauseWithCompletionHandler:^(NSError *err) {
-                virtualMachineCompletionHandler(completionHandler, err);
-            }];
+            [(VZVirtualMachine *)machine pauseWithCompletionHandler:handler];
         });
+        Block_release(handler);
         return;
     }
 
@@ -1090,11 +1100,11 @@ void pauseWithCompletionHandler(void *machine, void *queue, void *completionHand
 void resumeWithCompletionHandler(void *machine, void *queue, void *completionHandler)
 {
     if (@available(macOS 11, *)) {
+        vm_completion_handler_t handler = makeVMCompletionHandler(completionHandler);
         dispatch_sync((dispatch_queue_t)queue, ^{
-            [(VZVirtualMachine *)machine resumeWithCompletionHandler:^(NSError *err) {
-                virtualMachineCompletionHandler(completionHandler, err);
-            }];
+            [(VZVirtualMachine *)machine resumeWithCompletionHandler:handler];
         });
+        Block_release(handler);
         return;
     }
 
@@ -1104,11 +1114,11 @@ void resumeWithCompletionHandler(void *machine, void *queue, void *completionHan
 void stopWithCompletionHandler(void *machine, void *queue, void *completionHandler)
 {
     if (@available(macOS 12, *)) {
+        vm_completion_handler_t handler = makeVMCompletionHandler(completionHandler);
         dispatch_sync((dispatch_queue_t)queue, ^{
-            [(VZVirtualMachine *)machine stopWithCompletionHandler:^(NSError *err) {
-                virtualMachineCompletionHandler(completionHandler, err);
-            }];
+            [(VZVirtualMachine *)machine stopWithCompletionHandler:handler];
         });
+        Block_release(handler);
         return;
     }
 

virtualization_arm64.m

@@ -1,6 +1,6 @@
 #ifdef __arm64__
 #import "virtualization_arm64.h"
-#import "virtualization_raise.h"
+#import "virtualization_helper.h"
 
 @implementation ProgressObserver
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context;

virtualization_debug.m

@@ -5,7 +5,7 @@
 //
 
 #import "virtualization_debug.h"
-#import "virtualization_raise.h"
+#import "virtualization_helper.h"
 
 /*!
  @abstract Create a VZGDBDebugStubConfiguration with debug port for GDB server.