From patchwork Mon Mar 18 20:28:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 15415 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 8AF6323E00 for ; Mon, 18 Mar 2013 20:28:30 +0000 (UTC) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by fiordland.canonical.com (Postfix) with ESMTP id 3643AA18275 for ; Mon, 18 Mar 2013 20:28:30 +0000 (UTC) Received: by mail-vc0-f172.google.com with SMTP id hr11so3386458vcb.3 for ; Mon, 18 Mar 2013 13:28:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=5/iI979DJMXTobYt5n9BnaI/bKEP9PDkocF1ylG0RP8=; b=ENxXKIdno5STjp2EEWNTUDpi+a5SSiqlVDC3KGouSzhaUp8P+LA5LnYe1yND/R4NJG eRC9V39+Lx894WzH06aQOdpYor8H8Ni1Owj62nO8RhrbGvYFJ6shFoqCAmcjtS0x8YjV MytrSTr9MCrjJ0cIvtTJRNZIfcRvH9jC9w3FZ9qT70u2MK5csrZV2Zl+1EHk61OTaRyy txcNdDUNGxfZ62JQc0eGyWwIIRs8BSu9RsM4RohVaZuzg536EiUjEBW2mCdRTJMUsm4G jCBS7LvI37V2QU98VkO4Bthd8B0ziXmcv6CU8jfoWtR9PrMxR1BX/RuPnu8jFL+cWcXA odcg== X-Received: by 10.58.48.166 with SMTP id m6mr21791106ven.59.1363638509699; Mon, 18 Mar 2013 13:28:29 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp49488veb; Mon, 18 Mar 2013 13:28:28 -0700 (PDT) X-Received: by 10.194.89.169 with SMTP id bp9mr27885319wjb.57.1363638508461; Mon, 18 Mar 2013 13:28:28 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id gg15si817167wic.2.2013.03.18.13.28.27 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 18 Mar 2013 13:28:28 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Authentication-Results: mx.google.com; spf=neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1UHgfN-0007hu-UO; Mon, 18 Mar 2013 20:28:21 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori , Gerd Hoffmann Subject: [PATCH] ui/cocoa.m: Fix compile failures introduced by recent console changes Date: Mon, 18 Mar 2013 20:28:21 +0000 Message-Id: <1363638501-29603-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQk2bSggxQbOhGgQmY1pTIJaQWYY+NY3KJ4/jNd57Jx0mlMQB9TEzQ9Lsrf+XusYHxocwMIO Fix various compilation failures introduced by the recent console changes. Signed-off-by: Peter Maydell Acked-by: Gerd Hoffmann --- 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)