| Message ID | 1366226195-10668-1-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Accepted |
| Commit | 68c0aa6e02f79f8825c0c5dc4c7ed25d524aaa8b |
| Headers | show |
On 04/17/13 21: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 <peter.maydell@linaro.org> Reviewed-by: Gerd Hoffmann <kraxel@redhat.com> cheers, Gerd
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/ thanks! -- PMM On 17 April 2013 20:16, Peter Maydell <peter.maydell@linaro.org> 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 <peter.maydell@linaro.org> > --- > 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 > >
Thanks, applied. On Sun, Apr 21, 2013 at 9:54 AM, Peter Maydell <peter.maydell@linaro.org> wrote: > 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/ > > thanks! > -- PMM > > On 17 April 2013 20:16, Peter Maydell <peter.maydell@linaro.org> 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 <peter.maydell@linaro.org> >> --- >> 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 >> >>
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 <peter.maydell@linaro.org> 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 <peter.maydell@linaro.org> >> --- >> 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 >> >>
On 22 April 2013 00:03, Andreas Färber <andreas.faerber@web.de> wrote: > 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 suspect that whatever compiler you're using here treats 'vector' as a magic word, so when it sees a prototype like static inline void trace_megasas_msix_raise(int vector) it's expecting that 'vector' is an attribute of the type and it wants "int vector foo", hence the error message. You could test this theory by changing all the 'vector's in trace-events to 'vec' instead and rebuilding. thanks -- PMM
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)
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 <peter.maydell@linaro.org> --- ui/cocoa.m | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)