[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/19] chardev: add console support to qapi
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 11/19] chardev: add console support to qapi |
Date: |
Tue, 12 Mar 2013 09:56:21 +0100 |
This patch adds 'console' support to qapi and also switches over the
console chardev initialization to the new qapi code path.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
qapi-schema.json | 3 ++-
qemu-char.c | 9 +++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/qapi-schema.json b/qapi-schema.json
index 77d4153..94a3f02 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3226,7 +3226,8 @@
'mux' : 'ChardevMux',
'msmouse': 'ChardevDummy',
'braille': 'ChardevDummy',
- 'stdio' : 'ChardevStdio' } }
+ 'stdio' : 'ChardevStdio',
+ 'console': 'ChardevDummy' } }
##
# @ChardevReturn:
diff --git a/qemu-char.c b/qemu-char.c
index 6be38b0..4f0fdce 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -1928,7 +1928,7 @@ static CharDriverState *qemu_chr_open_win_file(HANDLE
fd_out)
return chr;
}
-static CharDriverState *qemu_chr_open_win_con(QemuOpts *opts)
+static CharDriverState *qemu_chr_open_win_con(void)
{
return qemu_chr_open_win_file(GetStdHandle(STD_OUTPUT_HANDLE));
}
@@ -3684,6 +3684,11 @@ ChardevReturn *qmp_chardev_add(const char *id,
ChardevBackend *backend,
case CHARDEV_BACKEND_KIND_STDIO:
chr = qemu_chr_open_stdio(backend->stdio);
break;
+#ifdef _WIN32
+ case CHARDEV_BACKEND_KIND_CONSOLE:
+ chr = qemu_chr_open_win_con();
+ break;
+#endif
default:
error_setg(errp, "unknown chardev backend (%d)", backend->kind);
break;
@@ -3740,9 +3745,9 @@ static void register_types(void)
register_char_driver_qapi("parport", CHARDEV_BACKEND_KIND_PARALLEL,
qemu_chr_parse_parallel);
register_char_driver_qapi("pty", CHARDEV_BACKEND_KIND_PTY, NULL);
+ register_char_driver_qapi("console", CHARDEV_BACKEND_KIND_CONSOLE, NULL);
#ifdef _WIN32
register_char_driver("pipe", qemu_chr_open_win_pipe);
- register_char_driver("console", qemu_chr_open_win_con);
#else
register_char_driver("pipe", qemu_chr_open_pipe);
#endif
--
1.7.9.7
- [Qemu-devel] [PULL v3 00/19] chardev: qapi conversion continued, Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 04/19] chardev: add msmouse support to qapi, Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 01/19] chardev: add support for qapi-based chardev initialization, Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 09/19] chardev: switch parallel init to qapi, Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 03/19] chardev: switch null init to qapi, Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 06/19] chardev: switch file init to qapi, Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 08/19] chardev: switch serial/tty init to qapi, Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 02/19] chardev: add mux chardev support to qapi, Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 05/19] chardev: add braille support to qapi, Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 11/19] chardev: add console support to qapi,
Gerd Hoffmann <=
- Re: [Qemu-devel] [PULL v3 00/19] chardev: qapi conversion continued, Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 19/19] qemu-char.c: fix waiting for telnet connection message, Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 13/19] chardev: add spice support to qapi, Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 12/19] chardev: add pipe support to qapi, Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 15/19] [fixup] vc, Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 14/19] chardev: add vc support to qapi, Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 07/19] chardev: add stdio support to qapi, Gerd Hoffmann, 2013/03/12