From patchwork Wed Apr 17 19:16:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 16177 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f199.google.com (mail-vc0-f199.google.com [209.85.220.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AB0E523911 for ; Wed, 17 Apr 2013 19:17:20 +0000 (UTC) Received: by mail-vc0-f199.google.com with SMTP id ha12sf3174533vcb.10 for ; Wed, 17 Apr 2013 12:16:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=fOpDfczD02IW9j2ALW8yBa2PXw1ZFgyPuQM1yyTvV1I=; b=b67Hcg2KcII/fvvDzBy/yNAxm9kOIqawM07oePG14Wju31aQJUNC0cfZUjlYP9fQIJ BwdsR/sU2bCtpfigfCDVZBar9mXrH1u0qTChTrbyQWzCFHtZ+O/sDmDv9ekGBpYMIQnu rJ5YuxWr50kVKxorW9Oxsn4hgmho/1ju1E1XG2c1Y1W8Qu4iG1pZBlSYntjcHHeA8A2D gqiowNSUwSUpEIUKdmBg0J+MezyqHLkR/Uxk8LnH3NCTdd/vOzofZwJ9DWX+M2NXHPyu +bK4KGk2ztqPlq5AE3/w4nZ3hWJOzUkJkfA+9RrX6vjG8CkMAwVoX0pBUN8jOp9hAXnz kraA== X-Received: by 10.58.163.168 with SMTP id yj8mr2935454veb.31.1366226204620; Wed, 17 Apr 2013 12:16:44 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.47.78 with SMTP id b14ls1054691qen.18.gmail; Wed, 17 Apr 2013 12:16:44 -0700 (PDT) X-Received: by 10.52.97.131 with SMTP id ea3mr5009152vdb.71.1366226204224; Wed, 17 Apr 2013 12:16:44 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id ex4si4679502vdb.53.2013.04.17.12.16.44 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 17 Apr 2013 12:16:44 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id ib11so1617989vcb.20 for ; Wed, 17 Apr 2013 12:16:44 -0700 (PDT) X-Received: by 10.52.34.168 with SMTP id a8mr5062398vdj.75.1366226204024; Wed, 17 Apr 2013 12:16:44 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp87983veb; Wed, 17 Apr 2013 12:16:43 -0700 (PDT) X-Received: by 10.194.171.74 with SMTP id as10mr13722498wjc.0.1366226202932; Wed, 17 Apr 2013 12:16:42 -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 j6si2588064wjy.9.2013.04.17.12.16.42 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 17 Apr 2013 12:16:42 -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; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1USXqN-0002mV-Qq; Wed, 17 Apr 2013 20:16:35 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Gerd Hoffmann , Anthony Liguori , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paolo Bonzini Subject: [PATCH] ui/cocoa.m: Fix recent compile breakage Date: Wed, 17 Apr 2013 20:16:35 +0100 Message-Id: <1366226195-10668-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQlsS3pB/8hHY2vaBlZ5q9aM+Ye5FjMhwFHXJPuUTEPy1Te90ESwldbpWkTe2Zs95ErGrw63 X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Fix failures to compile introduced by recent console commits 1dbfa00503, 81c0d5a6) which removed is_graphic_console() and vga_hw_update() without updating the cocoa UI backend to match. Signed-off-by: Peter Maydell Reviewed-by: Gerd Hoffmann --- ui/cocoa.m | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/cocoa.m b/ui/cocoa.m index 048cc97..d51462a 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -495,7 +495,7 @@ QemuCocoaView *cocoaView; if (keycode == 58 || keycode == 69) { // emulate caps lock and num lock keydown and keyup kbd_put_keycode(keycode); kbd_put_keycode(keycode | 0x80); - } else if (is_graphic_console()) { + } else if (qemu_console_is_graphic(NULL)) { if (keycode & 0x80) kbd_put_keycode(0xe0); if (modifiers_state[keycode] == 0) { // keydown @@ -535,7 +535,7 @@ QemuCocoaView *cocoaView; } // handle keys for graphic console - } else if (is_graphic_console()) { + } else if (qemu_console_is_graphic(NULL)) { if (keycode & 0x80) //check bit for e0 in front kbd_put_keycode(0xe0); kbd_put_keycode(keycode & 0x7f); //remove e0 bit in front @@ -578,7 +578,7 @@ QemuCocoaView *cocoaView; break; case NSKeyUp: keycode = cocoa_keycode_to_qemu([event keyCode]); - if (is_graphic_console()) { + if (qemu_console_is_graphic(NULL)) { if (keycode & 0x80) kbd_put_keycode(0xe0); kbd_put_keycode(keycode | 0x80); //add 128 to signal release of key @@ -1006,7 +1006,7 @@ static void cocoa_refresh(DisplayChangeListener *dcl) [cocoaView handleEvent:event]; } } while(event != nil); - vga_hw_update(); + graphic_hw_update(NULL); } static void cocoa_cleanup(void)