Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
elmarco committed Sep 4, 2023
1 parent 6505fd8 commit e265917
Showing 1 changed file with 17 additions and 14 deletions.
31 changes: 17 additions & 14 deletions ui/console.c
Expand Up @@ -125,6 +125,8 @@ struct QemuConsole {
QTAILQ_ENTRY(QemuConsole) next;
};

OBJECT_DEFINE_TYPE(QemuConsole, qemu_console, QEMU_CONSOLE, OBJECT)

struct VCChardev {
Chardev parent;
QemuConsole *console;
Expand Down Expand Up @@ -1313,6 +1315,21 @@ static QemuConsole *new_console(console_type_t console_type, uint32_t head)
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)
Expand Down Expand Up @@ -2646,13 +2663,6 @@ void qemu_chr_parse_vc(QemuOpts *opts, ChardevBackend *backend, Error **errp)
}
}

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);
Expand All @@ -2678,10 +2688,3 @@ void qemu_console_early_init(void)
type_register(&char_vc_type_info);
}
}

static void register_types(void)
{
type_register_static(&qemu_console_info);
}

type_init(register_types);

0 comments on commit e265917

Please sign in to comment.