[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/14] console: make qemu_alloc_display static
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 06/14] console: make qemu_alloc_display static |
Date: |
Wed, 17 Oct 2012 15:29:06 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
console.c | 48 ++++++++++++++++++++++++------------------------
console.h | 2 --
2 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/console.c b/console.c
index 5e1c5f5..48d88e4 100644
--- a/console.c
+++ b/console.c
@@ -1294,30 +1294,8 @@ static QemuConsole *new_console(DisplayState *ds,
console_type_t console_type)
return s;
}
-DisplaySurface *qemu_create_displaysurface(DisplayState *ds,
- int width, int height)
-{
- DisplaySurface *surface = g_new0(DisplaySurface, 1);
-
- int linesize = width * 4;
- qemu_alloc_display(surface, width, height, linesize,
- qemu_default_pixelformat(32), 0);
- return surface;
-}
-
-DisplaySurface *qemu_resize_displaysurface(DisplayState *ds,
- int width, int height)
-{
- int linesize = width * 4;
-
- trace_displaysurface_resize(ds, ds->surface, width, height);
- qemu_alloc_display(ds->surface, width, height, linesize,
- qemu_default_pixelformat(32), 0);
- return ds->surface;
-}
-
-void qemu_alloc_display(DisplaySurface *surface, int width, int height,
- int linesize, PixelFormat pf, int newflags)
+static void qemu_alloc_display(DisplaySurface *surface, int width, int height,
+ int linesize, PixelFormat pf, int newflags)
{
surface->width = width;
surface->height = height;
@@ -1342,6 +1320,28 @@ void qemu_alloc_display(DisplaySurface *surface, int
width, int height,
#endif
}
+DisplaySurface *qemu_create_displaysurface(DisplayState *ds,
+ int width, int height)
+{
+ DisplaySurface *surface = g_new0(DisplaySurface, 1);
+
+ int linesize = width * 4;
+ qemu_alloc_display(surface, width, height, linesize,
+ qemu_default_pixelformat(32), 0);
+ return surface;
+}
+
+DisplaySurface *qemu_resize_displaysurface(DisplayState *ds,
+ int width, int height)
+{
+ int linesize = width * 4;
+
+ trace_displaysurface_resize(ds, ds->surface, width, height);
+ qemu_alloc_display(ds->surface, width, height, linesize,
+ qemu_default_pixelformat(32), 0);
+ return ds->surface;
+}
+
DisplaySurface *qemu_create_displaysurface_from(int width, int height, int bpp,
int linesize, uint8_t *data)
{
diff --git a/console.h b/console.h
index c546e98..96ef165 100644
--- a/console.h
+++ b/console.h
@@ -190,8 +190,6 @@ void register_displaystate(DisplayState *ds);
DisplayState *get_displaystate(void);
DisplaySurface* qemu_create_displaysurface_from(int width, int height, int bpp,
int linesize, uint8_t *data);
-void qemu_alloc_display(DisplaySurface *surface, int width, int height,
- int linesize, PixelFormat pf, int newflags);
PixelFormat qemu_different_endianness_pixelformat(int bpp);
PixelFormat qemu_default_pixelformat(int bpp);
--
1.7.1
- [Qemu-devel] [PATCH 00/14] pixman patch series., Gerd Hoffmann, 2012/10/17
- [Qemu-devel] [PATCH 09/14] vga: stop direct access to DisplaySurface fields., Gerd Hoffmann, 2012/10/17
- [Qemu-devel] [PATCH 04/14] pixman: helper functions, Gerd Hoffmann, 2012/10/17
- [Qemu-devel] [PATCH 13/14] pixman/vnc: remove dead code., Gerd Hoffmann, 2012/10/17
- [Qemu-devel] [PATCH 01/14] console: remove DisplayAllocator, Gerd Hoffmann, 2012/10/17
- [Qemu-devel] [PATCH 05/14] pixman: add pixman image to DisplaySurface, Gerd Hoffmann, 2012/10/17
- [Qemu-devel] [PATCH 02/14] pixman: add submodule, Gerd Hoffmann, 2012/10/17
- [Qemu-devel] [PATCH 08/14] qxl: stop direct access to DisplaySurface fields., Gerd Hoffmann, 2012/10/17
- [Qemu-devel] [PATCH 10/14] pixman: switch screendump function., Gerd Hoffmann, 2012/10/17
- [Qemu-devel] [PATCH 06/14] console: make qemu_alloc_display static,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 12/14] pixman/vnc: remove rgb_prepare_row* functions, Gerd Hoffmann, 2012/10/17
- [Qemu-devel] [PATCH 07/14] console: don't set PixelFormat alpha fields for 32bpp, Gerd Hoffmann, 2012/10/17
- [Qemu-devel] [PATCH 03/14] pixman: windup in configure & makefiles, Gerd Hoffmann, 2012/10/17
- [Qemu-devel] [PATCH 14/14] pixman: drop obsolete fields from DisplaySurface, Gerd Hoffmann, 2012/10/17
- [Qemu-devel] [PATCH 11/14] pixman/vnc: use pixman images in vnc., Gerd Hoffmann, 2012/10/17