From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:53745)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kraxel@redhat.com>) id 1UHqgi-0006Iw-7a
	for qemu-devel@nongnu.org; Tue, 19 Mar 2013 03:10:25 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <kraxel@redhat.com>) id 1UHqgf-0003Av-Ei
	for qemu-devel@nongnu.org; Tue, 19 Mar 2013 03:10:24 -0400
Received: from mx1.redhat.com ([209.132.183.28]:52874)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kraxel@redhat.com>) id 1UHqgf-0003Ar-5p
	for qemu-devel@nongnu.org; Tue, 19 Mar 2013 03:10:21 -0400
Message-ID: <51480F58.2040602@redhat.com>
Date: Tue, 19 Mar 2013 08:10:16 +0100
From: Gerd Hoffmann <kraxel@redhat.com>
MIME-Version: 1.0
References: <1363638501-29603-1-git-send-email-peter.maydell@linaro.org>
In-Reply-To: <1363638501-29603-1-git-send-email-peter.maydell@linaro.org>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] ui/cocoa.m: Fix compile failures
 introduced by recent console changes
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: =?ISO-8859-1?Q?Andreas_F?= =?ISO-8859-1?Q?=E4rber?= <andreas.faerber@web.de>, Anthony Liguori <aliguori@us.ibm.com>, qemu-devel@nongnu.org, patches@linaro.org

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