From 3022e6b472d0f6d56efbe890e0f1c94841b170d4 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Mon, 27 May 2013 12:38:58 +0200 Subject: [PATCH 1/2] Revert "chardev: Get filename for new qapi backend" Does not handle chardevs created via chardev-add monitor command. This reverts commit 2b220025993e76d4116781ca91a4fabc5ad9c722. Signed-off-by: Gerd Hoffmann --- qemu-char.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 4f8382e540..f825294a9b 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); From 60d95386abf1f5f37ded6a812d12ac458df2491b Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Mon, 27 May 2013 12:41:24 +0200 Subject: [PATCH 2/2] chardev: fix "info chardev" output Fill unset CharDriverState->filename with the backend name, so 'info chardev' will return at least the chardev type. Don't touch it in case the chardev init function filled it already, like the socket+pty chardevs do for example. Signed-off-by: Gerd Hoffmann --- qemu-char.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qemu-char.c b/qemu-char.c index f825294a9b..d04b429a03 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3801,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 {