commit e265917c77710ef721e4c333bccfecf030c7776c
author Marc-André Lureau <marcandre.lureau@redhat.com> Wed Aug 30 13:37:51 2023 +0400
committer Marc-André Lureau <marcandre.lureau@redhat.com> Mon Sep 04 13:38:06 2023 +0400
tree 4b50cb1d9b109ebd46ce0ff5b10155839abd3015
parent 6505fd8d2390e57c6a2e84f9c07b9e408ad7da76

ui/console: use OBJECT_DEFINE_TYPE for QemuConsole

The following patch will move some object initialization to the
corresponding handlers.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230830093843.3531473-18-marcandre.lureau@redhat.com>

ui/console.c

diff --git a/ui/console.c b/ui/console.c
index 1336a1b..14fb38c 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -125,6 +125,8 @@
     QTAILQ_ENTRY(QemuConsole) next;
 };
 
+OBJECT_DEFINE_TYPE(QemuConsole, qemu_console, QEMU_CONSOLE, OBJECT)
+
 struct VCChardev {
     Chardev parent;
     QemuConsole *console;
@@ -1313,6 +1315,21 @@
     return s;
 }
 
+static void
+qemu_console_finalize(Object *obj)
+{
+}
+
+static void
+qemu_console_class_init(ObjectClass *oc, void *data)
+{
+}
+
+static void
+qemu_console_init(Object *obj)
+{
+}
+
 #ifdef WIN32
 void qemu_displaysurface_win32_set_handle(DisplaySurface *surface,
                                           HANDLE h, uint32_t offset)
@@ -2646,13 +2663,6 @@
     }
 }
 
-static const TypeInfo qemu_console_info = {
-    .name = TYPE_QEMU_CONSOLE,
-    .parent = TYPE_OBJECT,
-    .instance_size = sizeof(QemuConsole),
-    .class_size = sizeof(QemuConsoleClass),
-};
-
 static void char_vc_class_init(ObjectClass *oc, void *data)
 {
     ChardevClass *cc = CHARDEV_CLASS(oc);
@@ -2678,10 +2688,3 @@
         type_register(&char_vc_type_info);
     }
 }
-
-static void register_types(void)
-{
-    type_register_static(&qemu_console_info);
-}
-
-type_init(register_types);