[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 31/67] ui/vc: move some text console initialization to qom handle
From: |
marcandre . lureau |
Subject: |
[PATCH 31/67] ui/vc: move some text console initialization to qom handlers |
Date: |
Wed, 30 Aug 2023 13:38:05 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
ui/console.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/ui/console.c b/ui/console.c
index 22505d093f..5d521ba79d 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1413,9 +1413,20 @@ qemu_text_console_class_init(ObjectClass *oc, void *data)
}
}
+static const GraphicHwOps text_console_ops = {
+ .invalidate = text_console_invalidate,
+ .text_update = text_console_update,
+};
+
static void
qemu_text_console_init(Object *obj)
{
+ QemuTextConsole *c = QEMU_TEXT_CONSOLE(obj);
+
+ fifo8_create(&c->out_fifo, 16);
+ c->total_height = DEFAULT_BACKSCROLL;
+ QEMU_CONSOLE(c)->hw_ops = &text_console_ops;
+ QEMU_CONSOLE(c)->hw = c;
}
static void
@@ -2528,11 +2539,6 @@ static void text_console_update_cursor(void *opaque)
}
}
-static const GraphicHwOps text_console_ops = {
- .invalidate = text_console_invalidate,
- .text_update = text_console_update,
-};
-
static void vc_chr_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
@@ -2570,9 +2576,6 @@ static void vc_chr_open(Chardev *chr,
s->chr = chr;
drv->console = s;
- fifo8_create(&s->out_fifo, 16);
-
- s->total_height = DEFAULT_BACKSCROLL;
if (QEMU_CONSOLE(s)->scanout.kind != SCANOUT_SURFACE) {
if (active_console && active_console->scanout.kind == SCANOUT_SURFACE)
{
g_width = qemu_console_get_width(active_console, g_width);
@@ -2582,9 +2585,6 @@ static void vc_chr_open(Chardev *chr,
QEMU_CONSOLE(s)->scanout.kind = SCANOUT_SURFACE;
}
- QEMU_CONSOLE(s)->hw_ops = &text_console_ops;
- QEMU_CONSOLE(s)->hw = s;
-
/* set current text attributes to default */
drv->t_attrib = TEXT_ATTRIBUTES_DEFAULT;
text_console_resize(s);
--
2.41.0
- [PATCH 21/67] ui/console: register the console from qemu_console_init(), (continued)
- [PATCH 21/67] ui/console: register the console from qemu_console_init(), marcandre . lureau, 2023/08/30
- [PATCH 22/67] ui/console: remove new_console(), marcandre . lureau, 2023/08/30
- [PATCH 23/67] ui/console: specialize console_lookup_unused(), marcandre . lureau, 2023/08/30
- [PATCH 24/67] ui/console: update the head from unused QemuConsole, marcandre . lureau, 2023/08/30
- [PATCH 25/67] ui/console: allocate ui_timer in QemuConsole, marcandre . lureau, 2023/08/30
- [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 <=
- [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, 2023/08/30
- [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