[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 36/41] char: move console in its own file
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULL 36/41] char: move console in its own file |
Date: |
Tue, 31 Jan 2017 20:21:17 +0400 |
Signed-off-by: Marc-André Lureau <address@hidden>
Acked-by: Eric Blake <address@hidden>
---
chardev/char-console.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++
chardev/char.c | 3 ---
chardev/Makefile.objs | 1 +
3 files changed, 54 insertions(+), 3 deletions(-)
create mode 100644 chardev/char-console.c
diff --git a/chardev/char-console.c b/chardev/char-console.c
new file mode 100644
index 0000000000..c824937fe6
--- /dev/null
+++ b/chardev/char-console.c
@@ -0,0 +1,53 @@
+/*
+ * QEMU System Emulator
+ *
+ * Copyright (c) 2003-2008 Fabrice Bellard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#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);
diff --git a/chardev/char.c b/chardev/char.c
index e93dfb8d86..8ae8b5a4c3 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -2343,9 +2343,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
diff --git a/chardev/Makefile.objs b/chardev/Makefile.objs
index ee40e8a1d7..265a6dad5d 100644
--- a/chardev/Makefile.objs
+++ b/chardev/Makefile.objs
@@ -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
--
2.11.0.295.gd7dffce1c.dirty
- [Qemu-devel] [PULL 25/41] char: move ringbuf/memory to its own file, (continued)
- [Qemu-devel] [PULL 25/41] char: move ringbuf/memory to its own file, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 26/41] char: rename and move to header CHR_READ_BUF_LEN, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 27/41] char: remove unused READ_RETRIES, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 28/41] char: move QIOChannel-related stuff to char-io.h, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 29/41] char: move fd chardev in its own file, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 30/41] char: move win chardev base class in its own file, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 31/41] char: move win-stdio into its own file, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 33/41] char: move udp chardev in its own file, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 34/41] char: move file chardev in its own file, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 32/41] char: move socket chardev to its own file, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 36/41] char: move console in its own file,
Marc-André Lureau <=
- [Qemu-devel] [PULL 35/41] char: move stdio in its own file, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 37/41] char: move pipe chardev in its own file, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 38/41] char: move pty chardev in its own file, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 39/41] char: move serial chardev to its own file, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 41/41] char: headers clean-up, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 40/41] char: move parallel chardev in its own file, Marc-André Lureau, 2017/01/31
- Re: [Qemu-devel] [PULL 00/41] Chr split patches, no-reply, 2017/01/31
- Re: [Qemu-devel] [PULL 00/41] Chr split patches, Peter Maydell, 2017/01/31