diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2013-02-21 16:16:42 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2013-03-13 10:27:45 +0100 |
| commit | edb2fb3cc8b85ab956f366fc036ac12853984dae (patch) | |
| tree | 33245f6a4ed6e6250504c836e888172c096dd83a /qemu-char.c | |
| parent | 2c5f488293c7d0cd095635c74157c2526e2c4947 (diff) | |
| download | qemu-edb2fb3cc8b85ab956f366fc036ac12853984dae.tar.gz | |
chardev: add mux chardev support to qapi
This adds mux chardev support to the qapi and also makes the qapi-based
chardev creation path handle the "mux=on" option correctly.
Diffstat (limited to 'qemu-char.c')
| -rw-r--r-- | qemu-char.c | 35 |
1 files changed, 32 insertions, 3 deletions
diff --git a/qemu-char.c b/qemu-char.c index c2e198e858..0dc380280a 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3273,6 +3273,11 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, ChardevBackend *backend = g_new0(ChardevBackend, 1); ChardevReturn *ret = NULL; const char *id = qemu_opts_id(opts); + const char *bid = NULL; + + if (qemu_opt_get_bool(opts, "mux", 0)) { + bid = g_strdup_printf("%s-base", id); + } chr = NULL; backend->kind = cd->kind; @@ -3282,10 +3287,24 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, goto qapi_out; } } - ret = qmp_chardev_add(qemu_opts_id(opts), backend, errp); + ret = qmp_chardev_add(bid ? bid : id, backend, errp); if (error_is_set(errp)) { goto qapi_out; } + + if (bid) { + qapi_free_ChardevBackend(backend); + qapi_free_ChardevReturn(ret); + backend = g_new0(ChardevBackend, 1); + backend->mux = g_new0(ChardevMux, 1); + backend->kind = CHARDEV_BACKEND_KIND_MUX; + backend->mux->chardev = g_strdup(bid); + ret = qmp_chardev_add(id, backend, errp); + if (error_is_set(errp)) { + goto qapi_out; + } + } + chr = qemu_chr_find(id); qapi_out: @@ -3653,7 +3672,7 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, Error **errp) { ChardevReturn *ret = g_new0(ChardevReturn, 1); - CharDriverState *chr = NULL; + CharDriverState *base, *chr = NULL; chr = qemu_chr_find(id); if (chr) { @@ -3691,6 +3710,15 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, case CHARDEV_BACKEND_KIND_NULL: chr = qemu_chr_open_null(NULL); break; + case CHARDEV_BACKEND_KIND_MUX: + base = qemu_chr_find(backend->mux->chardev); + if (base == NULL) { + error_setg(errp, "mux: base chardev %s not found", + backend->mux->chardev); + break; + } + chr = qemu_chr_open_mux(base); + break; default: error_setg(errp, "unknown chardev backend (%d)", backend->kind); break; @@ -3701,7 +3729,8 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, } if (chr) { chr->label = g_strdup(id); - chr->avail_connections = 1; + chr->avail_connections = + (backend->kind == CHARDEV_BACKEND_KIND_MUX) ? MAX_MUX : 1; QTAILQ_INSERT_TAIL(&chardevs, chr, next); return ret; } else { |