new file mode 100644
@@ -0,0 +1,30 @@
+#include "qemu/osdep.h"
+#include "char-win.h"
+
+static void qemu_chr_open_win_con(Chardev *chr,
+ ChardevBackend *backend,
+ bool *be_opened,
+ Error **errp)
+{
+ qemu_chr_open_win_file(chr, GetStdHandle(STD_OUTPUT_HANDLE));
+}
+
+static void char_console_class_init(ObjectClass *oc, void *data)
+{
+ ChardevClass *cc = CHARDEV_CLASS(oc);
+
+ cc->open = qemu_chr_open_win_con;
+}
+
+static const TypeInfo char_console_type_info = {
+ .name = TYPE_CHARDEV_CONSOLE,
+ .parent = TYPE_CHARDEV_WIN,
+ .class_init = char_console_class_init,
+};
+
+static void register_types(void)
+{
+ type_register_static(&char_console_type_info);
+}
+
+type_init(register_types);
@@ -1403,27 +1403,6 @@ static void qemu_chr_open_pipe(Chardev *chr,
}
}
-static void qemu_chr_open_win_con(Chardev *chr,
- ChardevBackend *backend,
- bool *be_opened,
- Error **errp)
-{
- qemu_chr_open_win_file(chr, GetStdHandle(STD_OUTPUT_HANDLE));
-}
-
-static void char_console_class_init(ObjectClass *oc, void *data)
-{
- ChardevClass *cc = CHARDEV_CLASS(oc);
-
- cc->open = qemu_chr_open_win_con;
-}
-
-static const TypeInfo char_console_type_info = {
- .name = TYPE_CHARDEV_CONSOLE,
- .parent = TYPE_CHARDEV_WIN,
- .class_init = char_console_class_init,
-};
-
#endif /* !_WIN32 */
int qemu_chr_wait_connected(Chardev *chr, Error **errp)
@@ -2319,9 +2298,6 @@ static void register_types(void)
#ifdef HAVE_CHARDEV_PTY
type_register_static(&char_pty_type_info);
#endif
-#ifdef _WIN32
- type_register_static(&char_console_type_info);
-#endif
type_register_static(&char_pipe_type_info);
/* this must be done after machine init, since we register FEs with muxes
@@ -1,4 +1,5 @@
chardev-obj-y += char.o
+chardev-obj-$(CONFIG_WIN32) += char-console.o
chardev-obj-$(CONFIG_POSIX) += char-fd.o
chardev-obj-y += char-file.o
chardev-obj-y += char-io.o
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- chardev/char-console.c | 30 ++++++++++++++++++++++++++++++ chardev/char.c | 24 ------------------------ chardev/Makefile.objs | 1 + 3 files changed, 31 insertions(+), 24 deletions(-) create mode 100644 chardev/char-console.c