openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'afaerber/cocoa-for-upstream' into staging

This commit is contained in:
Anthony Liguori 2011-11-01 17:29:24 -05:00
parent ef26ee0e6c 13766eb1e4
commit 8aceefd77c
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MAINTAINERS
View File

@ -451,6 +451,11 @@ M: Anthony Liguori <aliguori@us.ibm.com>
S: Maintained
F: ui/
Cocoa graphics
M: Andreas Färber <andreas.faerber@web.de>
S: Odd Fixes
F: ui/cocoa.m
Main loop
M: Anthony Liguori <aliguori@us.ibm.com>
S: Supported

2
ui/cocoa.m
View File

@ -811,6 +811,8 @@ - (void)openPanelDidEnd:(NSOpenPanel *)sheet returnCode:(int)returnCode contextI
char **argv = (char**)malloc( sizeof(char*)*3 );
[sheet close];
asprintf(&argv[0], "%s", bin);
asprintf(&argv[1], "-hda");
asprintf(&argv[2], "%s", img);

4
vl.c
View File

@ -2185,7 +2185,9 @@ int main(int argc, char **argv, char **envp)
error_set_progname(argv[0]);
g_mem_set_vtable(&mem_trace);
g_thread_init(NULL);
if (!g_thread_supported()) {
g_thread_init(NULL);
}
runstate_init();