Patchwork xenfb: fix build breakage caused by console cleanup series

login
register
mail settings
Submitter Gerd Hoffmann
Date Nov. 2, 2012, 7:44 a.m.
Message ID <1351842253-30864-1-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/196492/
State New
Headers show

Comments

Gerd Hoffmann - Nov. 2, 2012, 7:44 a.m.
Console cleanup series renamed dpy_resize and dpy_update all over the
tree, but hw/xenfb.c was forgotten.  Update it too so it builds again.

Reported-by: Jan Kiszka <jan.kiszka@web.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/xenfb.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Andreas Färber - Nov. 2, 2012, 3:42 p.m.
Am 02.11.2012 08:44, schrieb Gerd Hoffmann:
> Console cleanup series renamed dpy_resize and dpy_update all over the
> tree, but hw/xenfb.c was forgotten.  Update it too so it builds again.
> 
> Reported-by: Jan Kiszka <jan.kiszka@web.de>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Acked-by: Andreas Färber <afaerber@suse.de>

Andreas
Anthony Liguori - Nov. 2, 2012, 7:12 p.m.
Gerd Hoffmann <kraxel@redhat.com> writes:

> Console cleanup series renamed dpy_resize and dpy_update all over the
> tree, but hw/xenfb.c was forgotten.  Update it too so it builds again.
>
> Reported-by: Jan Kiszka <jan.kiszka@web.de>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Applied. Thanks.

Regards,

Anthony Liguori

> ---
>  hw/xenfb.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/xenfb.c b/hw/xenfb.c
> index ef24c33..442a63a 100644
> --- a/hw/xenfb.c
> +++ b/hw/xenfb.c
> @@ -648,7 +648,7 @@ static void xenfb_guest_copy(struct XenFB *xenfb, int x, int y, int w, int h)
>          xen_be_printf(&xenfb->c.xendev, 0, "%s: oops: convert %d -> %d bpp?\n",
>                        __FUNCTION__, xenfb->depth, bpp);
>  
> -    dpy_update(xenfb->c.ds, x, y, w, h);
> +    dpy_gfx_update(xenfb->c.ds, x, y, w, h);
>  }
>  
>  #ifdef XENFB_TYPE_REFRESH_PERIOD
> @@ -766,7 +766,7 @@ static void xenfb_update(void *opaque)
>          xen_be_printf(&xenfb->c.xendev, 1, "update: resizing: %dx%d @ %d bpp%s\n",
>                        xenfb->width, xenfb->height, xenfb->depth,
>                        is_buffer_shared(xenfb->c.ds->surface) ? " (shared)" : "");
> -        dpy_resize(xenfb->c.ds);
> +        dpy_gfx_resize(xenfb->c.ds);
>          xenfb->up_fullscreen = 1;
>      }
>  
> -- 
> 1.7.1

Patch

diff --git a/hw/xenfb.c b/hw/xenfb.c
index ef24c33..442a63a 100644
--- a/hw/xenfb.c
+++ b/hw/xenfb.c
@@ -648,7 +648,7 @@  static void xenfb_guest_copy(struct XenFB *xenfb, int x, int y, int w, int h)
         xen_be_printf(&xenfb->c.xendev, 0, "%s: oops: convert %d -> %d bpp?\n",
                       __FUNCTION__, xenfb->depth, bpp);
 
-    dpy_update(xenfb->c.ds, x, y, w, h);
+    dpy_gfx_update(xenfb->c.ds, x, y, w, h);
 }
 
 #ifdef XENFB_TYPE_REFRESH_PERIOD
@@ -766,7 +766,7 @@  static void xenfb_update(void *opaque)
         xen_be_printf(&xenfb->c.xendev, 1, "update: resizing: %dx%d @ %d bpp%s\n",
                       xenfb->width, xenfb->height, xenfb->depth,
                       is_buffer_shared(xenfb->c.ds->surface) ? " (shared)" : "");
-        dpy_resize(xenfb->c.ds);
+        dpy_gfx_resize(xenfb->c.ds);
         xenfb->up_fullscreen = 1;
     }