[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/5] ui/cocoa: Fix code for starting QEMU via image
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 5/5] ui/cocoa: Fix code for starting QEMU via image file load dialog |
Date: |
Sun, 8 Dec 2013 22:59:06 +0000 |
Fix a number of bugs in the code for starting QEMU via the image
file load dialog:
* use the actual argv[0] rather than "qemu": this avoids failures to
find BIOS image files caused by not looking in the correct directory
relative to the executable path
* allocate a large enough argv array to NULL terminate it
* use g_strdup(X) rather than g_strdup_printf("%s", X) or
g_strdup_printf(X)
* disable the printing of the simulated command line argument
(which is presumably intended for debug only)
Signed-off-by: Peter Maydell <address@hidden>
---
ui/cocoa.m | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/ui/cocoa.m b/ui/cocoa.m
index 4ca1477..94bf729 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -834,18 +834,18 @@ QemuCocoaView *cocoaView;
if(returnCode == NSCancelButton) {
exit(0);
} else if(returnCode == NSOKButton) {
- const char *bin = "qemu";
char *img = (char*)[ [ [ sheet URL ] path ]
cStringUsingEncoding:NSASCIIStringEncoding];
- char **argv = (char**)malloc( sizeof(char*)*3 );
+ char **argv = g_new(char *, 4);
[sheet close];
- argv[0] = g_strdup_printf("%s", bin);
- argv[1] = g_strdup_printf("-hda");
- argv[2] = g_strdup_printf("%s", img);
+ argv[0] = g_strdup(gArgv[0]);
+ argv[1] = g_strdup("-hda");
+ argv[2] = g_strdup(img);
+ argv[3] = NULL;
- printf("Using argc %d argv %s -hda %s\n", 3, bin, img);
+ // printf("Using argc %d argv %s -hda %s\n", 3, gArgv[0], img);
[self startEmulationWithArgc:3 argv:(char**)argv];
}
--
1.7.11.4
- [Qemu-devel] [PATCH 0/5] miscellaneous minor cocoa UI patches, Peter Maydell, 2013/12/08
- [Qemu-devel] [PATCH 3/5] ui/cocoa: Send warning message to stderr, not stdout, Peter Maydell, 2013/12/08
- [Qemu-devel] [PATCH 5/5] ui/cocoa: Fix code for starting QEMU via image file load dialog,
Peter Maydell <=
- [Qemu-devel] [PATCH 2/5] ui/cocoa: Correct typos in comments and variable names, Peter Maydell, 2013/12/08
- [Qemu-devel] [PATCH 4/5] ui/cocoa: Add ".qcow2" to extension list for image load dialog, Peter Maydell, 2013/12/08
- [Qemu-devel] [PATCH 1/5] ui/cocoa: Pass command key through to guest when VM has mousegrab, Peter Maydell, 2013/12/08
- Re: [Qemu-devel] [PATCH 0/5] miscellaneous minor cocoa UI patches, Peter Maydell, 2013/12/23