From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50278) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UU3Ic-0006SA-Ar for qemu-devel@nongnu.org; Sun, 21 Apr 2013 19:03:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UU3Ib-00055D-1w for qemu-devel@nongnu.org; Sun, 21 Apr 2013 19:03:58 -0400 Received: from mout.web.de ([212.227.17.11]:57246) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UU3Ia-00054A-P1 for qemu-devel@nongnu.org; Sun, 21 Apr 2013 19:03:56 -0400 Message-ID: <51747056.6080803@web.de> Date: Mon, 22 Apr 2013 01:03:50 +0200 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= MIME-Version: 1.0 References: <1366226195-10668-1-git-send-email-peter.maydell@linaro.org> In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] ui/cocoa.m: Fix recent compile breakage List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Anthony Liguori , patches@linaro.org, Stefan Hajnoczi , qemu-devel@nongnu.org, Blue Swirl , Gerd Hoffmann , Paolo Bonzini Peter, Am 21.04.2013 11:54, schrieb Peter Maydell: > Early ping for compile-breakage fix patch (ccing Blue this time > round since you've been applying patches this weekend.) > > Patchwork url: http://patchwork.ozlabs.org/patch/237347/ Even after this has been applied, things are still not building for me. I'm seeing CC trace/generated-events.o failing with "error: parameter name omitted" for trace_apic_local_deliver, trace_usb_xhci_queue_event, trace_megasas_msix_raise and trace_spapr_pci_msi_setup, plus a warning that trace_event_count is being declared twice. I have already rm -rf'ed build and source tree to remove any leftover generated trace files, but no change. CC'ing Stefan. Andreas > > thanks! > -- PMM > > On 17 April 2013 20:16, Peter Maydell wrote: >> 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 >> --- >> 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) >> -- >> 1.7.11.4 >> >>