aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorKusanagi Kouichi <slash@ac.auone-net.jp>2011-04-26 19:19:26 +0900
committerAmit Shah <amit.shah@redhat.com>2011-04-28 11:03:07 +0530
commitd5b27167e17e0d9393d6364703cc68e7f018023c (patch)
tree3ce6acb13954c23310a88fb0cfb5444e15d96920 /hw
parentcd8f7df2891891c3a6c346892545c4407be6699f (diff)
downloadqemu-d5b27167e17e0d9393d6364703cc68e7f018023c.zip
qemu-d5b27167e17e0d9393d6364703cc68e7f018023c.tar.gz
qemu-d5b27167e17e0d9393d6364703cc68e7f018023c.tar.bz2
char: Allow devices to use a single multiplexed chardev.
This fixes regression caused by commit 2d6c1ef40f3678ab47a4d14fb5dadaa486bfcda6 ("char: Prevent multiple devices opening same chardev"): -nodefaults -nographic -chardev stdio,id=stdio,mux=on,signal=off \ -mon stdio -device virtio-serial-pci \ -device virtconsole,chardev=stdio -device isa-serial,chardev=stdio fails with: qemu-system-x86_64: -device isa-serial,chardev=stdio: Property 'isa-serial.chardev' can't take value 'stdio', it's in use Signed-off-by: Kusanagi Kouichi <slash@ac.auone-net.jp> Signed-off-by: Amit Shah <amit.shah@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/qdev-properties.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index 1088a26..eff2d24 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -354,10 +354,10 @@ static int parse_chr(DeviceState *dev, Property *prop, const char *str)
if (*ptr == NULL) {
return -ENOENT;
}
- if ((*ptr)->assigned) {
+ if ((*ptr)->avail_connections < 1) {
return -EEXIST;
}
- (*ptr)->assigned = 1;
+ --(*ptr)->avail_connections;
return 0;
}