[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/17] chardev: add console support to qapi
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 11/17] chardev: add console support to qapi |
Date: |
Thu, 28 Feb 2013 08:50:03 +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 2652b86..fe117ca 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -1765,7 +1765,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));
}
@@ -2985,9 +2985,9 @@ static const struct {
{ .name = "parport", .kind = CHARDEV_BACKEND_KIND_PARALLEL,
.parse = qemu_chr_parse_parallel },
{ .name = "pty", .kind = CHARDEV_BACKEND_KIND_PTY },
+ { .name = "console", .kind = CHARDEV_BACKEND_KIND_CONSOLE },
#ifdef _WIN32
{ .name = "pipe", .open = qemu_chr_open_win_pipe },
- { .name = "console", .open = qemu_chr_open_win_con },
#else
{ .name = "pipe", .open = qemu_chr_open_pipe },
#endif
@@ -3463,6 +3463,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;
--
1.7.9.7
- [Qemu-devel] [PATCH 03/17] chardev: switch null init to qapi, (continued)
- [Qemu-devel] [PATCH 03/17] chardev: switch null init to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 05/17] chardev: add braille support to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 07/17] chardev: add stdio support to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 08/17] chardev: switch serial/tty init to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 15/17] chardev: add memory (ringbuf) support to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 16/17] chardev: add udp support to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 01/17] chardev: add support for qapi-based chardev initialization, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 17/17] Revert "hmp: Disable chardev-add and chardev-remove", Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 12/17] chardev: add pipe support to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 14/17] chardev: add vc support to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 11/17] chardev: add console support to qapi,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 13/17] chardev: add spice support to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 06/17] chardev: switch file init to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 02/17] chardev: add mux chardev support to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 04/17] chardev: add msmouse support to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 10/17] chardev: switch pty init to qapi, Gerd Hoffmann, 2013/02/28
- [Qemu-devel] [PATCH 09/17] chardev: switch parallel init to qapi, Gerd Hoffmann, 2013/02/28