[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 38/67] ui/console: assert(surface) where appropriate
From: |
marcandre . lureau |
Subject: |
[PATCH 38/67] ui/console: assert(surface) where appropriate |
Date: |
Wed, 30 Aug 2023 13:38:12 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
The QemuTextConsole code paths assume a surface is being used as
scanout, let's make this more explicit.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
ui/console.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/ui/console.c b/ui/console.c
index a157a5b31c..04ec2d2488 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -339,6 +339,7 @@ static void qemu_console_fill_rect(QemuConsole *con, int
posx, int posy,
.x = posx, .y = posy, .width = width, .height = height
};
+ assert(surface);
pixman_image_fill_rectangles(PIXMAN_OP_SRC, surface->image,
&color, 1, &rect);
}
@@ -349,6 +350,7 @@ static void qemu_console_bitblt(QemuConsole *con,
{
DisplaySurface *surface = qemu_console_surface(con);
+ assert(surface);
pixman_image_composite(PIXMAN_OP_SRC,
surface->image, NULL, surface->image,
xs, ys, 0, 0, xd, yd, w, h);
@@ -392,6 +394,7 @@ static void vga_putcharxy(QemuConsole *s, int x, int y, int
ch,
DisplaySurface *surface = qemu_console_surface(s);
pixman_color_t fgcol, bgcol;
+ assert(surface);
if (t_attrib->invers) {
bgcol = color_table_rgb[t_attrib->bold][t_attrib->fgcol];
fgcol = color_table_rgb[t_attrib->bold][t_attrib->bgcol];
@@ -519,6 +522,7 @@ static void console_refresh(QemuTextConsole *s)
TextCell *c;
int x, y, y1;
+ assert(surface);
s->text_x[0] = 0;
s->text_y[0] = 0;
s->text_x[1] = s->width - 1;
--
2.41.0
- [PATCH 26/67] ui/vc: move cursor_timer initialization to QemuTextConsole class, (continued)
- [PATCH 26/67] ui/vc: move cursor_timer initialization to QemuTextConsole class, marcandre . lureau, 2023/08/30
- [PATCH 27/67] ui/console: free more QemuConsole resources, marcandre . lureau, 2023/08/30
- [PATCH 28/67] ui/vc: move text fields to QemuTextConsole, marcandre . lureau, 2023/08/30
- [PATCH 29/67] ui/console: move graphic fields to QemuGraphicConsole, marcandre . lureau, 2023/08/30
- [PATCH 30/67] ui/vc: fold text_console_do_init() in vc_chr_open(), marcandre . lureau, 2023/08/30
- [PATCH 31/67] ui/vc: move some text console initialization to qom handlers, marcandre . lureau, 2023/08/30
- [PATCH 32/67] ui/console: simplify getting active_console size, marcandre . lureau, 2023/08/30
- [PATCH 33/67] ui/console: remove need for g_width/g_height, marcandre . lureau, 2023/08/30
- [PATCH 34/67] ui/vc: use common text console surface creation, marcandre . lureau, 2023/08/30
- [PATCH 35/67] ui/console: declare console types in console.h, marcandre . lureau, 2023/08/30
- [PATCH 38/67] ui/console: assert(surface) where appropriate,
marcandre . lureau <=
- [PATCH 36/67] ui/console: use QEMU_PIXMAN_COLOR helpers, marcandre . lureau, 2023/08/30
- [PATCH 39/67] ui/console: fold text_console_update_cursor_timer, marcandre . lureau, 2023/08/30
- [PATCH 40/67] ui/vc: skip text console resize when possible, marcandre . lureau, 2023/08/30
- [PATCH 37/67] ui/console: rename vga_ functions → qemu_console_, marcandre . lureau, 2023/08/30
- [PATCH 41/67] ui/console: minor stylistic changes, marcandre . lureau, 2023/08/30