[Qemu-devel] [PULL 0/3] Cocoa fixes for 1.0

[Qemu-devel] [PULL 0/3] Cocoa fixes for 1.0

[Andreas Färber]

Hello Anthony,

Please pull these Cocoa-related patches for 1.0.

For our long-standing uint16 compilation issue we are still in need of a
fully correct solution. Depending on what we come up with, we'll try to
squeeze it in between RCs or defer it to next.

Regards,
Andreas

The following changes since commit 2ff6458116546ced7ce00cc39423ee30b1477e67:
  Anthony Liguori (1):
        Merge remote-tracking branch 'kraxel/usb.29' into staging

are available in the git repository at:

  git://repo.or.cz/qemu/afaerber.git cocoa-for-upstream

Andreas Färber (3):
      MAINTAINERS: Add Cocoa maintainer
      vl.c: Guard against GThread double-initialization
      cocoa: Close sheet after image file selection

 MAINTAINERS |    5 +++++
 ui/cocoa.m  |    2 ++
 vl.c        |    4 +++-
 3 files changed, 10 insertions(+), 1 deletions(-)

[Qemu-devel] [PATCH 1/3] MAINTAINERS: Add Cocoa maintainer

[Andreas Färber]

Degrade cocoa.m from Maintained to Odd Fixes.

Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Cc: Anthony Liguori <aliguori@us.ibm.com>
---
 MAINTAINERS |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index bccdd4f..7ee301e 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
-- 
1.7.0.3

[Qemu-devel] [PATCH 2/3] vl.c: Guard against GThread double-initialization

[Andreas Färber]

GThread-ERROR **: GThread system may only be initialized once.
aborting...

Making the g_thread_init() call in vl.c conditional resolves an abort on
Mac OS X, where coroutine-gthread.c seems to call it before vl.c.

Reported-by: Juan Pineda <juan@logician.com>
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Cc: Daniel P. Berrange <berrange@redhat.com>
---
 vl.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/vl.c b/vl.c
index b56e0cb..624da0f 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();
 
-- 
1.7.0.3

[Qemu-devel] [PATCH 3/3] cocoa: Close sheet after image file selection

[Andreas Färber]

If no disk image is specified, the Cocoa frontend displays a modal sheet
to let the user select an image file to boot from.

This sheet is never closed and it permanently obscures the emulator window.

Close it after obtaining the file name in case the user did select a file.
Otherwise we exit immediately, so no need to close then.

Signed-off-by: Juan Pineda <juan@logician.com>
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
---
 ui/cocoa.m |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ui/cocoa.m b/ui/cocoa.m
index d9e4e3d..0711205 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);
-- 
1.7.0.3

Re: [Qemu-devel] [PULL 0/3] Cocoa fixes for 1.0

[Anthony Liguori]

On 11/01/2011 02:56 PM, Andreas Färber wrote:
> Hello Anthony,
>
> Please pull these Cocoa-related patches for 1.0.
>
> For our long-standing uint16 compilation issue we are still in need of a
> fully correct solution. Depending on what we come up with, we'll try to
> squeeze it in between RCs or defer it to next.
>
> Regards,
> Andreas
>
> The following changes since commit 2ff6458116546ced7ce00cc39423ee30b1477e67:
>    Anthony Liguori (1):
>          Merge remote-tracking branch 'kraxel/usb.29' into staging

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> are available in the git repository at:
>
>    git://repo.or.cz/qemu/afaerber.git cocoa-for-upstream
>
> Andreas Färber (3):
>        MAINTAINERS: Add Cocoa maintainer
>        vl.c: Guard against GThread double-initialization
>        cocoa: Close sheet after image file selection
>
>   MAINTAINERS |    5 +++++
>   ui/cocoa.m  |    2 ++
>   vl.c        |    4 +++-
>   3 files changed, 10 insertions(+), 1 deletions(-)
>
>