提交 46a352a7 编写于 作者: A Anthony Liguori

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: NAnthony Liguori <aliguori@us.ibm.com>
...@@ -3276,7 +3276,6 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, ...@@ -3276,7 +3276,6 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts,
ChardevReturn *ret = NULL; ChardevReturn *ret = NULL;
const char *id = qemu_opts_id(opts); const char *id = qemu_opts_id(opts);
const char *bid = NULL; const char *bid = NULL;
char *filename = g_strdup(qemu_opt_get(opts, "backend"));
if (qemu_opt_get_bool(opts, "mux", 0)) { if (qemu_opt_get_bool(opts, "mux", 0)) {
bid = g_strdup_printf("%s-base", id); bid = g_strdup_printf("%s-base", id);
...@@ -3309,7 +3308,6 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts, ...@@ -3309,7 +3308,6 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts,
} }
chr = qemu_chr_find(id); chr = qemu_chr_find(id);
chr->filename = filename;
qapi_out: qapi_out:
qapi_free_ChardevBackend(backend); qapi_free_ChardevBackend(backend);
...@@ -3803,6 +3801,9 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, ...@@ -3803,6 +3801,9 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend,
chr->label = g_strdup(id); chr->label = g_strdup(id);
chr->avail_connections = chr->avail_connections =
(backend->kind == CHARDEV_BACKEND_KIND_MUX) ? MAX_MUX : 1; (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); QTAILQ_INSERT_TAIL(&chardevs, chr, next);
return ret; return ret;
} else { } else {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册