[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/22] console: make qemu_alloc_display static
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 14/22] console: make qemu_alloc_display static |
Date: |
Thu, 1 Nov 2012 14:04:09 +0100 |
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 f19e6a4..21bd957 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 06/22] console: init displaychangelisteners on register, (continued)
- [Qemu-devel] [PATCH 06/22] console: init displaychangelisteners on register, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 16/22] qxl: stop direct access to DisplaySurface fields., Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 22/22] pixman: drop obsolete fields from DisplaySurface, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 21/22] pixman/vnc: remove dead code., Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 05/22] console: untangle gfx & txt updates, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 02/22] console: add unregister_displaychangelistener, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 09/22] console: remove DisplayAllocator, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 19/22] pixman/vnc: use pixman images in vnc., Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 14/22] console: make qemu_alloc_display static,
Gerd Hoffmann <=
- Re: [Qemu-devel] [PULL 00/22] console cleanups & pixman rendering, Anthony Liguori, 2012/11/01