diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-11-01 17:29:24 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-11-01 17:29:24 -0500 |
| commit | 8aceefd77c2bb5af02759d11eb836c42ad9e720d (patch) | |
| tree | 06eef615cd364695d19e568a5f3029911a1298fe | |
| parent | ef26ee0e6c67d415f8b22850f9f13a972ada8be1 (diff) | |
| parent | 13766eb1e46452affd12f2b944730e136c6a2dda (diff) | |
| download | focaccia-qemu-8aceefd77c2bb5af02759d11eb836c42ad9e720d.tar.gz focaccia-qemu-8aceefd77c2bb5af02759d11eb836c42ad9e720d.zip | |
Merge remote-tracking branch 'afaerber/cocoa-for-upstream' into staging
| -rw-r--r-- | MAINTAINERS | 5 | ||||
| -rw-r--r-- | ui/cocoa.m | 2 | ||||
| -rw-r--r-- | vl.c | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bccdd4f78f..7ee301e787 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 diff --git a/ui/cocoa.m b/ui/cocoa.m index d9e4e3dcaa..0711205cbe 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -811,6 +811,8 @@ QemuCocoaView *cocoaView; char **argv = (char**)malloc( sizeof(char*)*3 ); + [sheet close]; + asprintf(&argv[0], "%s", bin); asprintf(&argv[1], "-hda"); asprintf(&argv[2], "%s", img); diff --git a/vl.c b/vl.c index b56e0cb378..624da0fd3c 100644 --- a/vl.c +++ b/vl.c @@ -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(); |