diff --git a/Services/UTMProcess.h b/Services/UTMProcess.h index 10de12b1..70690c48 100644 --- a/Services/UTMProcess.h +++ b/Services/UTMProcess.h @@ -27,6 +27,7 @@ typedef int (*UTMProcessThreadEntry)(UTMProcess *self, int argc, const char * _N @property (nonatomic, readonly) BOOL hasRemoteProcess; @property (nonatomic, readonly) NSURL *libraryURL; @property (nonatomic) NSArray *argv; +@property (nonatomic, readonly) NSString *arguments; @property (nonatomic, nullable) NSDictionary *environment; @property (nonatomic) NSInteger status; @property (nonatomic) NSInteger fatal; diff --git a/Services/UTMProcess.m b/Services/UTMProcess.m index 63105a94..66131bf4 100644 --- a/Services/UTMProcess.m +++ b/Services/UTMProcess.m @@ -95,6 +95,18 @@ static int defaultEntry(UTMProcess *self, int argc, const char *argv[], const ch return _connection != nil; } +- (NSString *)arguments { + NSString *args = @""; + for (NSString *arg in _argv) { + if ([arg containsString:@" "]) { + args = [args stringByAppendingFormat:@" \"%@\"", arg]; + } else { + args = [args stringByAppendingFormat:@" %@", arg]; + } + } + return args; +} + #pragma mark - Construction - (instancetype)init { @@ -149,15 +161,7 @@ static int defaultEntry(UTMProcess *self, int argc, const char *argv[], const ch } - (void)printArgv { - NSString *args = @""; - for (NSString *arg in _argv) { - if ([arg containsString:@" "]) { - args = [args stringByAppendingFormat:@" \"%@\"", arg]; - } else { - args = [args stringByAppendingFormat:@" %@", arg]; - } - } - UTMLog(@"Running: %@", args); + UTMLog(@"Running: %@", self.arguments); } - (BOOL)didLoadDylib:(void *)handle { diff --git a/Services/UTMQemuSystem.m b/Services/UTMQemuSystem.m index cfade3f6..72beaab1 100644 --- a/Services/UTMQemuSystem.m +++ b/Services/UTMQemuSystem.m @@ -70,6 +70,11 @@ static int startQemu(UTMProcess *process, int argc, const char *argv[], const ch [self doesNotRecognizeSelector:_cmd]; } +- (void)setLogging:(QEMULogging *)logging { + _logging = logging; + [logging writeLine:[NSString stringWithFormat:@"Launching: qemu-system-%@%@\n", self.architecture, self.arguments]]; +} + - (instancetype)initWithArguments:(NSArray *)arguments architecture:(nonnull NSString *)architecture { self = [super initWithArguments:arguments]; if (self) {