mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-24 03:59:52 +00:00
ui/console: Remove qemu_create_display_surface_guestmem()
The qemu_create_display_surface_guestmem() function was added in
commit a77549b3ff
but apparently never used. Remove it.
(The API of this function is in any case awkward as a generic
function: it assumes that a physical address uniquely identifies
a piece of memory in the system, which is mostly but not
always true.)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20181122170309.4856-1-peter.maydell@linaro.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
1b63665c2c
commit
22571ffa0c
@ -257,10 +257,6 @@ DisplaySurface *qemu_create_displaysurface_from(int width, int height,
|
||||
pixman_format_code_t format,
|
||||
int linesize, uint8_t *data);
|
||||
DisplaySurface *qemu_create_displaysurface_pixman(pixman_image_t *image);
|
||||
DisplaySurface *qemu_create_displaysurface_guestmem(int width, int height,
|
||||
pixman_format_code_t format,
|
||||
int linesize,
|
||||
uint64_t addr);
|
||||
DisplaySurface *qemu_create_message_surface(int w, int h,
|
||||
const char *msg);
|
||||
PixelFormat qemu_default_pixelformat(int bpp);
|
||||
|
36
ui/console.c
36
ui/console.c
@ -1385,42 +1385,6 @@ DisplaySurface *qemu_create_displaysurface_pixman(pixman_image_t *image)
|
||||
return surface;
|
||||
}
|
||||
|
||||
static void qemu_unmap_displaysurface_guestmem(pixman_image_t *image,
|
||||
void *unused)
|
||||
{
|
||||
void *data = pixman_image_get_data(image);
|
||||
uint32_t size = pixman_image_get_stride(image) *
|
||||
pixman_image_get_height(image);
|
||||
cpu_physical_memory_unmap(data, size, 0, 0);
|
||||
}
|
||||
|
||||
DisplaySurface *qemu_create_displaysurface_guestmem(int width, int height,
|
||||
pixman_format_code_t format,
|
||||
int linesize, uint64_t addr)
|
||||
{
|
||||
DisplaySurface *surface;
|
||||
hwaddr size;
|
||||
void *data;
|
||||
|
||||
if (linesize == 0) {
|
||||
linesize = width * PIXMAN_FORMAT_BPP(format) / 8;
|
||||
}
|
||||
|
||||
size = (hwaddr)linesize * height;
|
||||
data = cpu_physical_memory_map(addr, &size, 0);
|
||||
if (size != (hwaddr)linesize * height) {
|
||||
cpu_physical_memory_unmap(data, size, 0, 0);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
surface = qemu_create_displaysurface_from
|
||||
(width, height, format, linesize, data);
|
||||
pixman_image_set_destroy_function
|
||||
(surface->image, qemu_unmap_displaysurface_guestmem, NULL);
|
||||
|
||||
return surface;
|
||||
}
|
||||
|
||||
DisplaySurface *qemu_create_message_surface(int w, int h,
|
||||
const char *msg)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user