summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2013-06-27 15:25:12 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2013-06-28 14:04:00 -0500
commit2ea3e2c1e85097c45a882dbc1fbba4a7fdb3ff1c (patch)
tree4f51836aed2df106b95320ec3ecb113a126db2de
parent43f420f8419866619bd107d5ee84c727b46967b8 (diff)
downloadqemu-2ea3e2c1e85097c45a882dbc1fbba4a7fdb3ff1c.tar.gz
qemu-2ea3e2c1e85097c45a882dbc1fbba4a7fdb3ff1c.tar.bz2
qemu-2ea3e2c1e85097c45a882dbc1fbba4a7fdb3ff1c.zip
qemu-char: Fix ID reuse after chardev-remove for qapi-based init
Commit 2c5f488 introduced qapi-based character device initialization as a new code path in qemu_chr_new_from_opts(). Unfortunately, it failed to store parameter opts in the new chardev. Therefore, qemu_chr_delete() doesn't delete it. Even though the device is gone, its options linger, and any attempt to create another one with the same ID fails. Cc: qemu-stable@nongnu.org Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 1372339512-28149-1-git-send-email-armbru@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--qemu-char.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/qemu-char.c b/qemu-char.c
index a030e6b01e..63972ae4be 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -3219,6 +3219,7 @@ CharDriverState *qemu_chr_new_from_opts(QemuOpts *opts,
}
chr = qemu_chr_find(id);
+ chr->opts = opts;
qapi_out:
qapi_free_ChardevBackend(backend);