diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-29 08:12:53 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-29 08:12:53 -0500 |
| commit | 46a352a7d7a47b3733ae76c0a0906d6934f81fc0 (patch) | |
| tree | ee0dfc06b1e636a8e2aae0d5fcb1b6bec571cc5e | |
| parent | c199707ad0dcbb4a72e7435551c7f23b9606a063 (diff) | |
| parent | 60d95386abf1f5f37ded6a812d12ac458df2491b (diff) | |
Merge remote-tracking branch 'kraxel/chardev.6' into staging
# By Gerd Hoffmann
# Via Gerd Hoffmann
* kraxel/chardev.6:
chardev: fix "info chardev" output
Revert "chardev: Get filename for new qapi backend"
Message-id: 1369722844-24345-1-git-send-email-kraxel@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | qemu-char.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qemu-char.c b/qemu-char.c index 4f8382e540..d04b429a03 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3276,7 +3276,6 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, ChardevReturn *ret = NULL; const char *id = qemu_opts_id(opts); const char *bid = NULL; - char *filename = g_strdup(qemu_opt_get(opts, "backend")); if (qemu_opt_get_bool(opts, "mux", 0)) { bid = g_strdup_printf("%s-base", id); @@ -3309,7 +3308,6 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, } chr = qemu_chr_find(id); - chr->filename = filename; qapi_out: qapi_free_ChardevBackend(backend); @@ -3803,6 +3801,9 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, chr->label = g_strdup(id); chr->avail_connections = (backend->kind == CHARDEV_BACKEND_KIND_MUX) ? MAX_MUX : 1; + if (!chr->filename) { + chr->filename = g_strdup(ChardevBackendKind_lookup[backend->kind]); + } QTAILQ_INSERT_TAIL(&chardevs, chr, next); return ret; } else { |