Commit 537a4391 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

console: make qemu_alloc_display static 



Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 69c77777

console.c

+24 −24
Original line number Diff line number Diff line
@@ -1294,29 +1294,7 @@ 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,

static void qemu_alloc_display(DisplaySurface *surface, int width, int height,

                               int linesize, PixelFormat pf, int newflags)

{

    surface->width = width;
@@ -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)

{

console.h

+0 −2
Original line number Diff line number Diff line
@@ -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);