[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 04/10] chardev: add qmp hotplug commands, with nu
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH v2 04/10] chardev: add qmp hotplug commands, with null chardev support |
Date: |
Thu, 10 Jan 2013 15:23:00 +0100 |
Add chardev-add and chardev-remove qmp commands. Hotplugging
a null chardev is supported for now, more will be added later.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
qapi-schema.json | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
qemu-char.c | 42 ++++++++++++++++++++++++++++++++++++++++++
qmp-commands.hx | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 141 insertions(+), 0 deletions(-)
diff --git a/qapi-schema.json b/qapi-schema.json
index 5dfa052..53d4b9e 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3017,3 +3017,52 @@
# Since: 1.3.0
##
{ 'command': 'nbd-server-stop' }
+
+##
+# @ChardevBackend:
+#
+# Configuration info for the new chardev backend.
+#
+# Since: 1.4
+##
+{ 'type': 'ChardevDummy', 'data': { } }
+
+{ 'union': 'ChardevBackend', 'data': { 'null' : 'ChardevDummy' } }
+
+##
+# @ChardevReturn:
+#
+# Return infos about the chardev backend just created.
+#
+# Since: 1.4
+##
+{ 'type' : 'ChardevReturn', 'data': { } }
+
+##
+# @chardev-add:
+#
+# Add a file chardev
+#
+# @id: the chardev's ID, must be unique
+# @backend: backend type and parameters
+#
+# Returns: chardev info.
+#
+# Since: 1.4
+##
+{ 'command': 'chardev-add', 'data': {'id' : 'str',
+ 'backend' : 'ChardevBackend' },
+ 'returns': 'ChardevReturn' }
+
+##
+# @chardev-remove:
+#
+# Remove a chardev
+#
+# @id: the chardev's ID, must exist and not be in use
+#
+# Returns: Nothing on success
+#
+# Since: 1.4
+##
+{ 'command': 'chardev-remove', 'data': {'id': 'str'} }
diff --git a/qemu-char.c b/qemu-char.c
index c511de3..62d35b6 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2938,3 +2938,45 @@ CharDriverState *qemu_char_get_next_serial(void)
return serial_hds[next_serial++];
}
+ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend,
+ Error **errp)
+{
+ ChardevReturn *ret = g_new0(ChardevReturn, 1);
+ CharDriverState *chr = NULL;
+
+ switch (backend->kind) {
+ case CHARDEV_BACKEND_KIND_NULL:
+ chr = qemu_chr_open_null(NULL);
+ break;
+ default:
+ error_setg(errp, "unknown chardev backend (%d)", backend->kind);
+ break;
+ }
+
+ if (chr == NULL && !error_is_set(errp)) {
+ error_setg(errp, "Failed to create chardev");
+ }
+ if (chr) {
+ chr->label = g_strdup(id);
+ chr->avail_connections = 1;
+ QTAILQ_INSERT_TAIL(&chardevs, chr, next);
+ }
+ return ret;
+}
+
+void qmp_chardev_remove(const char *id, Error **errp)
+{
+ CharDriverState *chr;
+
+ chr = qemu_chr_find(id);
+ if (NULL == chr) {
+ error_setg(errp, "Chardev '%s' not found", id);
+ return;
+ }
+ if (chr->chr_can_read || chr->chr_read ||
+ chr->chr_event || chr->handler_opaque) {
+ error_setg(errp, "Chardev '%s' is busy", id);
+ return;
+ }
+ qemu_chr_delete(chr);
+}
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 5c692d0..c9ab37c 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -2654,3 +2654,53 @@ EQMP
.args_type = "",
.mhandler.cmd_new = qmp_marshal_input_query_target,
},
+
+ {
+ .name = "chardev-add",
+ .args_type = "id:s,backend:q",
+ .mhandler.cmd_new = qmp_marshal_input_chardev_add,
+ },
+
+SQMP
+chardev-add
+----------------
+
+Add a chardev.
+
+Arguments:
+
+- "id": the chardev's ID, must be unique (json-string)
+- "backend": chardev backend type + parameters
+
+Example:
+
+-> { "execute" : "chardev-add",
+ "arguments" : { "id" : "foo",
+ "backend" : { "type" : "null", "data" : {} } } }
+<- { "return": {} }
+
+EQMP
+
+ {
+ .name = "chardev-remove",
+ .args_type = "id:s",
+ .mhandler.cmd_new = qmp_marshal_input_chardev_remove,
+ },
+
+
+SQMP
+chardev-remove
+--------------
+
+Remove a chardev.
+
+Arguments:
+
+- "id": the chardev's ID, must exist and not be in use (json-string)
+
+Example:
+
+-> { "execute": "chardev-remove", "arguments": { "id" : "foo" } }
+<- { "return": {} }
+
+EQMP
--
1.7.1
- [Qemu-devel] [PATCH v2 01/10] chardev: add error reporting for qemu_chr_new_from_opts, (continued)
- [Qemu-devel] [PATCH v2 01/10] chardev: add error reporting for qemu_chr_new_from_opts, Gerd Hoffmann, 2013/01/10
- [Qemu-devel] [PATCH v2 08/10] chardev: add parallel chardev support to chardev-add (qmp), Gerd Hoffmann, 2013/01/10
- [Qemu-devel] [PATCH v2 02/10] chardev: fix QemuOpts lifecycle, Gerd Hoffmann, 2013/01/10
- [Qemu-devel] [PATCH v2 06/10] chardev: add file chardev support to chardev-add (qmp), Gerd Hoffmann, 2013/01/10
- [Qemu-devel] [PATCH v2 03/10] chardev: reduce chardev ifdef mess a bit, Gerd Hoffmann, 2013/01/10
- [Qemu-devel] [PATCH v2 04/10] chardev: add qmp hotplug commands, with null chardev support,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH v2 10/10] chardev: add pty chardev support to chardev-add (qmp), Gerd Hoffmann, 2013/01/10