From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Fri, 6 Jun 2008 17:04:11 +0000 (+0100)
Subject: Fix for vga_save_dpy_resize (vga_screen_dump) prototype wrt linesize etc.
X-Git-Tag: xen-3.3.0-rc1~88
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=79a235b20a6833fe5bdc78b52921cdd2ad12f284;p=qemu-xen-4.4-testing.git

Fix for vga_save_dpy_resize (vga_screen_dump) prototype wrt linesize etc.

Patch kindly supplied by Stefano Stabellini.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/hw/vga.c b/hw/vga.c
index fca220f34..4fda5015d 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -2326,7 +2326,7 @@ static void vga_save_dpy_update(DisplayState *s,
 {
 }
 
-static void vga_save_dpy_resize(DisplayState *s, int w, int h, int linesize)
+static void vga_save_dpy_resize(DisplayState *s, int w, int h)
 {
     s->linesize = w * 4;
     s->data = qemu_malloc(h * s->linesize);
diff --git a/hw/xenfb.c b/hw/xenfb.c
index 2917d5c98..c684cdcef 100644
--- a/hw/xenfb.c
+++ b/hw/xenfb.c
@@ -1438,7 +1438,6 @@ static void xenfb_pv_colourdepth(DisplayState *ds, int depth)
         ds->data = NULL;
     } else {
         ds->data = xs->nonshared_vram;
-        fbfront_resize(fb_dev, ds->width, ds->height, ds->linesize, ds->depth, VGA_RAM_SIZE);
     }
 }