qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] ui/cocoa.m: Fix compile failures introduced by recent console changes
@ 2013-03-18 20:28 Peter Maydell
  2013-03-19  7:10 ` Gerd Hoffmann
  2013-03-19 18:58 ` Anthony Liguori
  0 siblings, 2 replies; 3+ messages in thread
From: Peter Maydell @ 2013-03-18 20:28 UTC (permalink / raw)
  To: qemu-devel; +Cc: Andreas Färber, Gerd Hoffmann, Anthony Liguori, patches

Fix various compilation failures introduced by the recent console
changes.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 ui/cocoa.m | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ui/cocoa.m b/ui/cocoa.m
index 8e0eaa2..048cc97 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -403,6 +403,9 @@ QemuCocoaView *cocoaView;
 {
     COCOA_DEBUG("QemuCocoaView: switchSurface\n");
 
+    int w = surface_width(surface);
+    int h = surface_height(surface);
+
     // update screenBuffer
     if (dataProviderRef)
         CGDataProviderRelease(dataProviderRef);
@@ -1014,9 +1017,9 @@ static void cocoa_cleanup(void)
 
 static const DisplayChangeListenerOps dcl_ops = {
     .dpy_name          = "cocoa",
-    .dpy_gfx_update = cocoa_update;
-    .dpy_gfx_switch = cocoa_switch;
-    .dpy_refresh = cocoa_refresh;
+    .dpy_gfx_update = cocoa_update,
+    .dpy_gfx_switch = cocoa_switch,
+    .dpy_refresh = cocoa_refresh,
 };
 
 void cocoa_display_init(DisplayState *ds, int full_screen)
-- 
1.7.11.4

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [Qemu-devel] [PATCH] ui/cocoa.m: Fix compile failures introduced by recent console changes
  2013-03-18 20:28 [Qemu-devel] [PATCH] ui/cocoa.m: Fix compile failures introduced by recent console changes Peter Maydell
@ 2013-03-19  7:10 ` Gerd Hoffmann
  2013-03-19 18:58 ` Anthony Liguori
  1 sibling, 0 replies; 3+ messages in thread
From: Gerd Hoffmann @ 2013-03-19  7:10 UTC (permalink / raw)
  To: Peter Maydell; +Cc: Andreas Färber, Anthony Liguori, qemu-devel, patches

On 03/18/13 21:28, Peter Maydell wrote:
> Fix various compilation failures introduced by the recent console
> changes.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  ui/cocoa.m | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/ui/cocoa.m b/ui/cocoa.m
> index 8e0eaa2..048cc97 100644
> --- a/ui/cocoa.m
> +++ b/ui/cocoa.m
> @@ -403,6 +403,9 @@ QemuCocoaView *cocoaView;
>  {
>      COCOA_DEBUG("QemuCocoaView: switchSurface\n");
>  
> +    int w = surface_width(surface);
> +    int h = surface_height(surface);
> +
>      // update screenBuffer
>      if (dataProviderRef)
>          CGDataProviderRelease(dataProviderRef);
> @@ -1014,9 +1017,9 @@ static void cocoa_cleanup(void)
>  
>  static const DisplayChangeListenerOps dcl_ops = {
>      .dpy_name          = "cocoa",
> -    .dpy_gfx_update = cocoa_update;
> -    .dpy_gfx_switch = cocoa_switch;
> -    .dpy_refresh = cocoa_refresh;
> +    .dpy_gfx_update = cocoa_update,
> +    .dpy_gfx_switch = cocoa_switch,
> +    .dpy_refresh = cocoa_refresh,
>  };
>  
>  void cocoa_display_init(DisplayState *ds, int full_screen)

Acked-by: Gerd Hoffmann <kraxel@redhat.com>

[ I'll go pick it into the next console patch series, but wouldn't
  mind if someone applies this directly to fix the macos build ].

cheers,
  Gerd

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [Qemu-devel] [PATCH] ui/cocoa.m: Fix compile failures introduced by recent console changes
  2013-03-18 20:28 [Qemu-devel] [PATCH] ui/cocoa.m: Fix compile failures introduced by recent console changes Peter Maydell
  2013-03-19  7:10 ` Gerd Hoffmann
@ 2013-03-19 18:58 ` Anthony Liguori
  1 sibling, 0 replies; 3+ messages in thread
From: Anthony Liguori @ 2013-03-19 18:58 UTC (permalink / raw)
  To: Peter Maydell, qemu-devel; +Cc: None, patches, Gerd Hoffmann, Anthony Liguori

Applied.  Thanks.

Regards,

Anthony Liguori

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-03-19 18:58 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-18 20:28 [Qemu-devel] [PATCH] ui/cocoa.m: Fix compile failures introduced by recent console changes Peter Maydell
2013-03-19  7:10 ` Gerd Hoffmann
2013-03-19 18:58 ` Anthony Liguori

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).