Patchwork ui/cocoa.m: Update to new DisplayChangeListener member names

login
register
mail settings
Submitter Peter Maydell
Date Nov. 2, 2012, 2:54 p.m.
Message ID <1351868083-26313-1-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/196578/
State New
Headers show

Comments

Peter Maydell - Nov. 2, 2012, 2:54 p.m.
Commit a93a4a2 changed the names of some fields in DisplayChangeListener
and broke compilation of the cocoa UI. Update to the new names.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 ui/cocoa.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Gerd Hoffmann - Nov. 2, 2012, 2:59 p.m.
On 11/02/12 15:54, Peter Maydell wrote:
> Commit a93a4a2 changed the names of some fields in DisplayChangeListener
> and broke compilation of the cocoa UI. Update to the new names.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Acked-by: Gerd Hoffmann <kraxel@redhat.com>

cheers,
  Gerd
Andreas Färber - Nov. 2, 2012, 3:04 p.m.
Am 02.11.2012 15:54, schrieb Peter Maydell:
> Commit a93a4a2 changed the names of some fields in DisplayChangeListener
> and broke compilation of the cocoa UI. Update to the new names.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Andreas Färber <andreas.faerber@web.de>

Peter, you didn't cc me - through whose queue is this supposed to go?
I don't have any other Cocoa patches queued for v1.3.

Thanks,
Andreas
Peter Maydell - Nov. 2, 2012, 3:19 p.m.
On 2 November 2012 16:04, Andreas Färber <andreas.faerber@web.de> wrote:
> Am 02.11.2012 15:54, schrieb Peter Maydell:
>> Commit a93a4a2 changed the names of some fields in DisplayChangeListener
>> and broke compilation of the cocoa UI. Update to the new names.
>>
>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>
> Reviewed-by: Andreas Färber <andreas.faerber@web.de>
>
> Peter, you didn't cc me - through whose queue is this supposed to go?
> I don't have any other Cocoa patches queued for v1.3.

Sorry, I forgot the cc. I don't care whose queue it goes through
(I have no relevant queue myself).
(I have a philosophical preference for compile fixes being applied
directly and quickly to master but my opinion on that matter is
not particularly significant :-))

-- PMM
Gerd Hoffmann - Nov. 2, 2012, 3:41 p.m.
Hi,

> (I have a philosophical preference for compile fixes being applied
> directly and quickly to master but my opinion on that matter is
> not particularly significant :-))

/me too.  Build fixes should go in on the fast track.  First because a
broken build is annonying.  Second because buildbots are less useful if
builds are broken for longer periods.

One of the reasons I didn't notice the xenfb breakage was because the
fedora build is broken for other reasons, so the buildbot doesn't came
to the point where it tries to build xenfb.c and figures it doesn't.

Should we maybe agree on a special buildfix patch subject tag, so
maintainers can easily filter and prioritize them?

cheers,
  Gerd
Andreas Färber - Nov. 2, 2012, 3:44 p.m.
Hi,

Am 02.11.2012 16:41, schrieb Gerd Hoffmann:
>> (I have a philosophical preference for compile fixes being applied
>> directly and quickly to master but my opinion on that matter is
>> not particularly significant :-))
> 
> /me too.  Build fixes should go in on the fast track.  First because a
> broken build is annonying.  Second because buildbots are less useful if
> builds are broken for longer periods.

Fine with me, less work. We should cc a maintainer then. ;)

> One of the reasons I didn't notice the xenfb breakage was because the
> fedora build is broken for other reasons, so the buildbot doesn't came
> to the point where it tries to build xenfb.c and figures it doesn't.
> 
> Should we maybe agree on a special buildfix patch subject tag, so
> maintainers can easily filter and prioritize them?

I used [PATCH buildfix] or so in the past.

Regards,
Andreas
Anthony Liguori - Nov. 2, 2012, 4:15 p.m.
Andreas Färber <andreas.faerber@web.de> writes:

> Hi,
>
> Am 02.11.2012 16:41, schrieb Gerd Hoffmann:
>>> (I have a philosophical preference for compile fixes being applied
>>> directly and quickly to master but my opinion on that matter is
>>> not particularly significant :-))
>> 
>> /me too.  Build fixes should go in on the fast track.  First because a
>> broken build is annonying.  Second because buildbots are less useful if
>> builds are broken for longer periods.
>
> Fine with me, less work. We should cc a maintainer then. ;)
>
>> One of the reasons I didn't notice the xenfb breakage was because the
>> fedora build is broken for other reasons, so the buildbot doesn't came
>> to the point where it tries to build xenfb.c and figures it doesn't.
>> 
>> Should we maybe agree on a special buildfix patch subject tag, so
>> maintainers can easily filter and prioritize them?
>
> I used [PATCH buildfix] or so in the past.

Not all build errors are created equal.

It's impossible for me to build cocoa support without physical Apple
hardware.

In this case, the cocoa maintainer (Andreas) should send an urgent pull
request to ensure the patch is properly tested.

I'm applying right now, so no worries this time, but if you are a
submaintainer, if there is something you consider urgent, you should
send a pull request.

Regards,

Anthony Liguori

>
> Regards,
> Andreas
Anthony Liguori - Nov. 2, 2012, 7:15 p.m.
Peter Maydell <peter.maydell@linaro.org> writes:

> Commit a93a4a2 changed the names of some fields in DisplayChangeListener
> and broke compilation of the cocoa UI. Update to the new names.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Applied. Thanks.

Regards,

Anthony Liguori

> ---
>  ui/cocoa.m | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/ui/cocoa.m b/ui/cocoa.m
> index 2383646..87d2e44 100644
> --- a/ui/cocoa.m
> +++ b/ui/cocoa.m
> @@ -1017,8 +1017,8 @@ void cocoa_display_init(DisplayState *ds, int full_screen)
>      dcl = g_malloc0(sizeof(DisplayChangeListener));
>  
>      // register vga output callbacks
> -    dcl->dpy_update = cocoa_update;
> -    dcl->dpy_resize = cocoa_resize;
> +    dcl->dpy_gfx_update = cocoa_update;
> +    dcl->dpy_gfx_resize = cocoa_resize;
>      dcl->dpy_refresh = cocoa_refresh;
>  
>  	register_displaychangelistener(ds, dcl);
> -- 
> 1.7.11.4

Patch

diff --git a/ui/cocoa.m b/ui/cocoa.m
index 2383646..87d2e44 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -1017,8 +1017,8 @@  void cocoa_display_init(DisplayState *ds, int full_screen)
     dcl = g_malloc0(sizeof(DisplayChangeListener));
 
     // register vga output callbacks
-    dcl->dpy_update = cocoa_update;
-    dcl->dpy_resize = cocoa_resize;
+    dcl->dpy_gfx_update = cocoa_update;
+    dcl->dpy_gfx_resize = cocoa_resize;
     dcl->dpy_refresh = cocoa_refresh;
 
 	register_displaychangelistener(ds, dcl);